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.79 and 1.83

version 1.79, 2013/05/21 12:10:12	version 1.83, 2013/05/30 09:41:41
Line 89 lancement_thread(void *argument)	Line 89 lancement_thread(void *argument)

(*s_argument_thread).tid = pthread_self();	(*s_argument_thread).tid = pthread_self();
insertion_thread(s_etat_processus, d_faux);	insertion_thread(s_etat_processus, d_faux);

	if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return(NULL);
	}

(*s_argument_thread).thread_actif = d_vrai;	(*s_argument_thread).thread_actif = d_vrai;

	if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	return(NULL);
	}

// Envoi d'une donnée pour signaler le démarrage du thread au thread	// Envoi d'une donnée pour signaler le démarrage du thread au thread
// de surveillance.	// de surveillance.

Line 367 lancement_thread(void *argument)	Line 380 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 453 lancement_thread(void *argument)	Line 466 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 477 lancement_thread(void *argument)	Line 491 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 494 lancement_thread(void *argument)	Line 509 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 527 lancement_thread(void *argument)	Line 543 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 582 lancement_thread(void *argument)	Line 599 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 633 lancement_thread(void *argument)	Line 651 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 651 lancement_thread(void *argument)	Line 670 lancement_thread(void *argument)
}	}
}	}

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

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

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
{	{
affectation_interruptions_logicielles(s_etat_processus);	affectation_interruptions_logicielles(s_etat_processus);
}	}

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

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

	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 983 lancement_thread(void *argument)	Line 1018 lancement_thread(void *argument)
liberation_allocateur(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_signaux));

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_destroy(&((*s_etat_processus).semaphore_fork));	sem_destroy(&((*s_etat_processus).semaphore_fork));
Line 998 lancement_thread(void *argument)	Line 1035 lancement_thread(void *argument)
free(s_etat_processus);	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;
pthread_mutex_unlock(&((*s_argument_thread).mutex));	pthread_mutex_unlock(&((*s_argument_thread).mutex));

(*s_argument_thread).thread_actif = d_faux;
pthread_exit(NULL);	pthread_exit(NULL);
return(NULL);	return(NULL);
}	}

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.79
changed lines
	Added in v.1.83