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.112

version 1.82, 2013/05/28 22:09:55	version 1.112, 2019/02/09 13:36:37
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.14	RPL/2 (R) version 4.1.31
Copyright (C) 1989-2013 Dr. BERTRAND Joël	Copyright (C) 1989-2019 Dr. BERTRAND Joël

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

Line 83 lancement_thread(void *argument)	Line 83 lancement_thread(void *argument)
pthread_self(), SEM_FORK)) == SEM_FAILED)	pthread_self(), SEM_FORK)) == SEM_FAILED)
{	{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return(NULL);	pthread_exit(NULL);
}	}
# endif	# endif

Line 93 lancement_thread(void *argument)	Line 93 lancement_thread(void *argument)
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0)	if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	pthread_exit(NULL);
}	}

(*s_argument_thread).thread_actif = d_vrai;	(*s_argument_thread).thread_actif = d_vrai;
Line 101 lancement_thread(void *argument)	Line 101 lancement_thread(void *argument)
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0)	if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0)
{	{
(*s_etat_processus).erreur_systeme = d_es_processus;	(*s_etat_processus).erreur_systeme = d_es_processus;
return(NULL);	pthread_exit(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
Line 150 lancement_thread(void *argument)	Line 150 lancement_thread(void *argument)
break;	break;
}	}

	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	pthread_exit(NULL);
	}

nanosleep(&attente, NULL);	nanosleep(&attente, NULL);

	while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
	{
	if (errno != EINTR)
	{
	(*s_etat_processus).erreur_systeme = d_es_processus;
	pthread_exit(NULL);
	}
	}
}	}

if ((*s_etat_processus).debug == d_vrai)	if ((*s_etat_processus).debug == d_vrai)
Line 337 lancement_thread(void *argument)	Line 352 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 387 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 424 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 432 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 473 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 481 lancement_thread(void *argument)	Line 489 lancement_thread(void *argument)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.thread_actif == d_vrai)	.thread_actif == d_vrai)
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(NULL,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread).tid,	((l_element_courant).donnee).objet)).thread).tid,
rpl_sigurg);	rpl_sigurg);
}	}
Line 490 lancement_thread(void *argument)	Line 499 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 517 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 524 lancement_thread(void *argument)	Line 535 lancement_thread(void *argument)
{	{
if ((*s_etat_processus).arret_depuis_abort == -1)	if ((*s_etat_processus).arret_depuis_abort == -1)
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(NULL,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.tid, rpl_sigabort);	.tid, rpl_sigabort);
}	}
else	else
{	{
envoi_signal_thread(((((struct_processus_fils *)	envoi_signal_thread(NULL,
	((((struct_processus_fils *)
((l_element_courant).donnee).objet)).thread)	((l_element_courant).donnee).objet)).thread)
.tid, rpl_sigstop);	.tid, rpl_sigstop);
}	}
Line 540 lancement_thread(void *argument)	Line 553 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 591 lancement_thread(void *argument)	Line 605 lancement_thread(void *argument)
.donnee).objet)).thread).nombre_objets_dans_pipe--;	.donnee).objet)).thread).nombre_objets_dans_pipe--;

action.sa_handler = SIG_IGN;	action.sa_handler = SIG_IGN;
action.sa_flags = SA_ONSTACK;	action.sa_flags = 0;

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 661 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 682 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 696 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 1025 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_post(&((*s_etat_processus).semaphore_fork));
sem_destroy(&((*s_etat_processus).semaphore_fork));	sem_destroy(&((*s_etat_processus).semaphore_fork));
# else	# else
	sem_post((*s_etat_processus).semaphore_fork);
sem_destroy3((*s_etat_processus).semaphore_fork, getpid(),	sem_destroy3((*s_etat_processus).semaphore_fork, getpid(),
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.112