rpl/src/instructions_d5.c - diff

Return to instructions_d5.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_d5.c between versions 1.74 and 1.94

version 1.74, 2011/09/21 09:09:22	version 1.94, 2012/10/05 13:12:39
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.3	RPL/2 (R) version 4.1.11
Copyright (C) 1989-2011 Dr. BERTRAND Joël	Copyright (C) 1989-2012 Dr. BERTRAND Joël

This file is part of RPL/2.	This file is part of RPL/2.

Line 817 instruction_detach(struct_processus *s_e	Line 817 instruction_detach(struct_processus *s_e
int pipe_initialisation_segment_signaux[2];	int pipe_initialisation_segment_signaux[2];

logical1 drapeau;	logical1 drapeau;
logical1 variable_partagee;

pid_t ppid;	pid_t ppid;
pid_t pid_final;	pid_t pid_final;
Line 856 instruction_detach(struct_processus *s_e	Line 855 instruction_detach(struct_processus *s_e

unsigned long i;	unsigned long i;

	volatile logical1 variable_partagee;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

attente.tv_sec = 0;	attente.tv_sec = 0;
Line 1231 instruction_detach(struct_processus *s_e	Line 1232 instruction_detach(struct_processus *s_e
return;	return;
}	}

# ifndef OS2	# ifdef SCHED_OTHER
# ifndef Cygwin
if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)	if (pthread_attr_setschedpolicy(&attributs, SCHED_OTHER) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
	# endif

	# ifdef PTHREAD_EXPLICIT_SCHED
if (pthread_attr_setinheritsched(&attributs,	if (pthread_attr_setinheritsched(&attributs,
PTHREAD_EXPLICIT_SCHED) != 0)	PTHREAD_EXPLICIT_SCHED) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
	# endif

	# ifdef PTHREAD_SCOPE_SYSTEM
if (pthread_attr_setscope(&attributs, PTHREAD_SCOPE_SYSTEM) != 0)	if (pthread_attr_setscope(&attributs, PTHREAD_SCOPE_SYSTEM) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return;	return;
}	}
# endif	# endif
# endif

(*s_argument_thread).s_etat_processus = s_etat_processus;	(*s_argument_thread).s_etat_processus = s_etat_processus;

Line 1364 instruction_detach(struct_processus *s_e	Line 1367 instruction_detach(struct_processus *s_e
l_element_courant = (*s_etat_processus).liste_mutexes;	l_element_courant = (*s_etat_processus).liste_mutexes;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
pthread_mutex_trylock(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));
pthread_mutex_unlock(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));
pthread_mutex_destroy(&((((struct_mutex ) ((l_element_courant)
.donnee).objet)).mutex));

liberation(s_etat_processus, (*l_element_courant).donnee);	liberation(s_etat_processus, (*l_element_courant).donnee);
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;
free(l_element_courant);	free(l_element_courant);
Line 1427 instruction_detach(struct_processus *s_e	Line 1423 instruction_detach(struct_processus *s_e
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}

	if (pthread_mutex_destroy(&mutex_sections_critiques) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;

	pid_final = -2;

	while((longueur_ecriture = write_atomic(s_etat_processus,
	(*s_argument_thread).pipe_nombre_interruptions_attente[1],
	&pid_final, sizeof(pid_final))) != sizeof(pid_final))
	{
	if (longueur_ecriture == -1)
	{
	break;
	}
	}

	while((longueur_ecriture = write_atomic(s_etat_processus,
	(*s_argument_thread).pipe_nombre_objets_attente[1],
	&pid_final, sizeof(pid_final))) != sizeof(pid_final))
	{
	if (longueur_ecriture == -1)
	{
	break;
	}
	}

	destruction_queue_signaux(s_etat_processus);
	BUG(1, uprintf("Process management error line %d\n", __LINE__));
	exit(EXIT_FAILURE);
	}

	pthread_mutexattr_init(&attributs_mutex);
	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE);
	pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex);
	pthread_mutexattr_destroy(&attributs_mutex);

if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
Line 1582 instruction_detach(struct_processus *s_e	Line 1614 instruction_detach(struct_processus *s_e
(*s_etat_processus).presence_fusible = d_faux;	(*s_etat_processus).presence_fusible = d_faux;
(*s_etat_processus).thread_fusible = 0;	(*s_etat_processus).thread_fusible = 0;
(*s_etat_processus).pid_erreur_processus_fils = getpid();	(*s_etat_processus).pid_erreur_processus_fils = getpid();
	(*s_etat_processus).sections_critiques = 0;

if ((*s_etat_processus).profilage == d_vrai)	if ((*s_etat_processus).profilage == d_vrai)
{	{
Line 1952 instruction_detach(struct_processus *s_e	Line 1985 instruction_detach(struct_processus *s_e

if ((*s_etat_processus).erreur_systeme == d_es)	if ((*s_etat_processus).erreur_systeme == d_es)
{	{
	// Évite le warning variable s_copie might be clobbered by
	// longjmp or vfork
	struct_objet **s;

	if ((s = malloc(sizeof(struct_objet *))) == NULL)
	{
	(*s_etat_processus).erreur_execution = d_es_allocation_memoire;
	return;
	}

	(*s) = s_copie;

if (setjmp(contexte_processus) == 0)	if (setjmp(contexte_processus) == 0)
{	{
if (variable_partagee == d_faux)	if (variable_partagee == d_faux)
Line 1985 instruction_detach(struct_processus *s_e	Line 2030 instruction_detach(struct_processus *s_e
}	}
else	else
{	{
if (evaluation(s_etat_processus, s_copie, 'E') == d_erreur)	if (evaluation(s_etat_processus, (*s), 'E') == d_erreur)
{	{
if (((*s_etat_processus).erreur_execution == d_ex) &&	if (((*s_etat_processus).erreur_execution == d_ex) &&
((*s_etat_processus).erreur_systeme == d_es))	((*s_etat_processus).erreur_systeme == d_es))
Line 1996 instruction_detach(struct_processus *s_e	Line 2041 instruction_detach(struct_processus *s_e
}	}
else	else
{	{
if ((*s_etat_processus).at_exit != NULL)	if (((*s_etat_processus).var_volatile_alarme == 0)
	&& ((*s_etat_processus).arret_depuis_abort == 0)
	&& ((*s_etat_processus).at_exit != NULL))
{	{
(*s_etat_processus).var_volatile_requete_arret = 0;	(*s_etat_processus).var_volatile_requete_arret = 0;

Line 2010 instruction_detach(struct_processus *s_e	Line 2057 instruction_detach(struct_processus *s_e
}	}
}	}

liberation(s_etat_processus, s_copie);	liberation(s_etat_processus, (*s));
}	}
}	}

	free(s);
	}

	for(i = 0; i < (*s_etat_processus).sections_critiques; i++)
	{
	pthread_mutex_unlock(&mutex_sections_critiques);
}	}

liberation(s_etat_processus, (*s_etat_processus).at_exit);	liberation(s_etat_processus, (*s_etat_processus).at_exit);
Line 2021 instruction_detach(struct_processus *s_e	Line 2075 instruction_detach(struct_processus *s_e
l_element_courant = (*s_etat_processus).liste_mutexes;	l_element_courant = (*s_etat_processus).liste_mutexes;
while(l_element_courant != NULL)	while(l_element_courant != NULL)
{	{
pthread_mutex_trylock(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));
pthread_mutex_unlock(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));
pthread_mutex_destroy(&((((struct_mutex )
((l_element_courant).donnee).objet)).mutex));

liberation(s_etat_processus, (*l_element_courant).donnee);	liberation(s_etat_processus, (*l_element_courant).donnee);
l_element_suivant = (*l_element_courant).suivant;	l_element_suivant = (*l_element_courant).suivant;
free(l_element_courant);	free(l_element_courant);
Line 2561 instruction_detach(struct_processus *s_e	Line 2608 instruction_detach(struct_processus *s_e
(*s_etat_processus).s_arbre_variables, d_vrai);	(*s_etat_processus).s_arbre_variables, d_vrai);
free((*s_etat_processus).pointeurs_caracteres_variables);	free((*s_etat_processus).pointeurs_caracteres_variables);

for(i = 0; i < (*s_etat_processus).nombre_variables_statiques; i++)
{
liberation(s_etat_processus,
(*s_etat_processus).s_liste_variables_statiques[i].objet);
free((*s_etat_processus).s_liste_variables_statiques[i].nom);
}

free((*s_etat_processus).s_liste_variables_statiques);

for(i = 0; i < ((s_etat_processus).s_liste_variables_partagees)	for(i = 0; i < ((s_etat_processus).s_liste_variables_partagees)
.nombre_variables; i++)	.nombre_variables; i++)
{	{
Line 2768 instruction_detach(struct_processus *s_e	Line 2806 instruction_detach(struct_processus *s_e
pthread_mutex_destroy(&((*s_etat_processus).mutex));	pthread_mutex_destroy(&((*s_etat_processus).mutex));
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));	pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes));
	pthread_mutex_destroy(&mutex_sections_critiques);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.74
changed lines
	Added in v.1.94