rpl/src/gestion_threads.c - diff

Return to gestion_threads.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/gestion_threads.c between versions 1.82 and 1.104

version 1.82, 2013/05/28 22:09:55	version 1.104, 2017/01/18 15:44:18
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.26
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2017 Dr. BERTRAND Joël

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

Line 337 lancement_thread(void *argument)	Line 337 lancement_thread(void *argument)
}	}
}	}

close((*s_argument_thread).pipe_erreurs[1]);
close((*s_argument_thread).pipe_interruptions[1]);
close((*s_argument_thread).pipe_nombre_elements_attente[1]);
close((*s_argument_thread).pipe_objets[1]);
close((*s_argument_thread).pipe_injections[0]);
close((*s_argument_thread).pipe_nombre_injections[0]);
close((*s_argument_thread).pipe_acquittement[0]);

l_element_courant = (*s_etat_processus).s_fichiers;	l_element_courant = (*s_etat_processus).s_fichiers;

while(l_element_courant != NULL)	while(l_element_courant != NULL)
Line 380 lancement_thread(void *argument)	Line 372 lancement_thread(void *argument)
l_element_courant = l_element_suivant;	l_element_courant = l_element_suivant;
}	}

pthread_mutex_lock(&((*s_etat_processus).mutex));	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));

l_element_courant = (struct_liste_chainee *)	l_element_courant = (struct_liste_chainee *)
(*s_etat_processus).l_base_pile_processus;	(*s_etat_processus).l_base_pile_processus;
Line 417 lancement_thread(void *argument)	Line 409 lancement_thread(void *argument)
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant)	((l_element_courant)
.donnee).objet)).thread).pid, rpl_sigurg);	.donnee).objet)).thread).pid, rpl_sigurg, d_faux);
}	}
else	else
{	{
Line 425 lancement_thread(void *argument)	Line 417 lancement_thread(void *argument)
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant)	((l_element_courant)
.donnee).objet)).thread).pid, rpl_sigabort);	.donnee).objet)).thread).pid, rpl_sigabort, d_faux);
}	}
else	else
{	{
envoi_signal_processus(((((struct_processus_fils *)	envoi_signal_processus(((((struct_processus_fils *)
((l_element_courant)	((l_element_courant)
.donnee).objet)).thread).pid, rpl_sigstop);	.donnee).objet)).thread).pid, rpl_sigstop,d_faux);
}	}
}	}
}	}
Line 466 lancement_thread(void *argument)	Line 458 lancement_thread(void *argument)
((l_element_courant).donnee).objet)).thread).mutex))	((l_element_courant).donnee).objet)).thread).mutex))
!= 0)	!= 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

pthread_mutex_lock(&((*s_argument_thread).mutex));	pthread_mutex_lock(&((*s_argument_thread).mutex));
Line 490 lancement_thread(void *argument)	Line 483 lancement_thread(void *argument)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.mutex)) != 0)	.mutex)) != 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

pthread_mutex_lock(&((*s_argument_thread).mutex));	pthread_mutex_lock(&((*s_argument_thread).mutex));
Line 507 lancement_thread(void *argument)	Line 501 lancement_thread(void *argument)
((l_element_courant).donnee).objet)).thread).mutex))	((l_element_courant).donnee).objet)).thread).mutex))
!= 0)	!= 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

pthread_mutex_lock(&((*s_argument_thread).mutex));	pthread_mutex_lock(&((*s_argument_thread).mutex));
Line 540 lancement_thread(void *argument)	Line 535 lancement_thread(void *argument)
((l_element_courant).donnee).objet)).thread).mutex))	((l_element_courant).donnee).objet)).thread).mutex))
!= 0)	!= 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;

pthread_mutex_lock(&((*s_argument_thread).mutex));	pthread_mutex_lock(&((*s_argument_thread).mutex));
Line 595 lancement_thread(void *argument)	Line 591 lancement_thread(void *argument)

if (sigaction(SIGPIPE, &action, &registre) != 0)	if (sigaction(SIGPIPE, &action, &registre) != 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

if (registre_stop == 0)	if (registre_stop == 0)
{	{
Line 646 lancement_thread(void *argument)	Line 643 lancement_thread(void *argument)

if (sigaction(SIGPIPE, &registre, NULL) != 0)	if (sigaction(SIGPIPE, &registre, NULL) != 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus)
	.mutex_pile_processus));

(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
Line 666 lancement_thread(void *argument)	Line 664 lancement_thread(void *argument)

if (pthread_mutex_lock(&((*s_etat_processus).mutex_interruptions)) != 0)	if (pthread_mutex_lock(&((*s_etat_processus).mutex_interruptions)) != 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));

(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
Line 680 lancement_thread(void *argument)	Line 678 lancement_thread(void *argument)
if (pthread_mutex_unlock(&((*s_etat_processus).mutex_interruptions))	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_interruptions))
!= 0)	!= 0)
{	{
pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));

(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
exit(EXIT_FAILURE);	exit(EXIT_FAILURE);
}	}

pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
pthread_mutex_lock(&((*s_etat_processus).mutex));	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));
}	}

pthread_mutex_unlock(&((*s_etat_processus).mutex));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));

l_element_courant = (*s_etat_processus).s_sockets;	l_element_courant = (*s_etat_processus).s_sockets;

Line 1009 lancement_thread(void *argument)	Line 1007 lancement_thread(void *argument)
liberation_profil(s_etat_processus);	liberation_profil(s_etat_processus);
}	}

liberation_allocateur(s_etat_processus);

retrait_thread(s_etat_processus);	retrait_thread(s_etat_processus);
pthread_mutex_destroy(&((*s_etat_processus).mutex));	pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus));
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation));
pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));	pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions));
	pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux));

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_destroy(&((*s_etat_processus).semaphore_fork));	sem_destroy(&((*s_etat_processus).semaphore_fork));
Line 1023 lancement_thread(void *argument)	Line 1020 lancement_thread(void *argument)
pthread_self(), SEM_FORK);	pthread_self(), SEM_FORK);
# endif	# endif

	close((*s_argument_thread).pipe_erreurs[1]);
	close((*s_argument_thread).pipe_interruptions[1]);
	close((*s_argument_thread).pipe_nombre_elements_attente[1]);
	close((*s_argument_thread).pipe_objets[1]);
	close((*s_argument_thread).pipe_injections[0]);
	close((*s_argument_thread).pipe_nombre_injections[0]);
	close((*s_argument_thread).pipe_acquittement[0]);

liberation_contexte_cas(s_etat_processus);	liberation_contexte_cas(s_etat_processus);
free((*s_etat_processus).localisation);	free((*s_etat_processus).localisation);
free(s_etat_processus);	liberation_allocateur(s_etat_processus);
	liberation_allocateur_buffer(s_etat_processus);
	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer));
	sys_free(s_etat_processus);

pthread_mutex_lock(&((*s_argument_thread).mutex));	pthread_mutex_lock(&((*s_argument_thread).mutex));
(*s_argument_thread).thread_actif = d_faux;	(*s_argument_thread).thread_actif = d_faux;

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.82
changed lines
	Added in v.1.104