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.95 and 1.117

version 1.95, 2015/02/01 09:47:18	version 1.117, 2021/03/13 12:50:39
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.20	RPL/2 (R) version 4.1.33
Copyright (C) 1989-2015 Dr. BERTRAND Joël	Copyright (C) 1989-2021 Dr. BERTRAND Joël

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

Line 77 lancement_thread(void *argument)	Line 77 lancement_thread(void *argument)
s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus;	s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus;

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);	if (sem_init(&((*s_etat_processus).semaphore_fork), 0, 0) != 0)
# else	# else
if (((*s_etat_processus).semaphore_fork = sem_init3(0, getpid(),	if (((*s_etat_processus).semaphore_fork = sem_init3(0, getpid(),
pthread_self(), SEM_FORK)) == SEM_FAILED)	pthread_self(), SEM_FORK)) == SEM_FAILED)
{
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
return(NULL);
}
# endif	# endif
	{
	(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
	pthread_exit(NULL);
	}

(*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);
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 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 482 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 527 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 594 lancement_thread(void *argument)	Line 604 lancement_thread(void *argument)
((((struct_processus_fils ) ((*l_element_courant)	((((struct_processus_fils ) ((*l_element_courant)
.donnee).objet)).thread).nombre_objets_dans_pipe--;	.donnee).objet)).thread).nombre_objets_dans_pipe--;

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

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(&mutex_sigaction);
pthread_mutex_unlock(&((*s_etat_processus)	pthread_mutex_unlock(&((*s_etat_processus)
.mutex_pile_processus));	.mutex_pile_processus));

Line 618 lancement_thread(void *argument)	Line 635 lancement_thread(void *argument)
}	}

(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	pthread_exit(NULL);
}	}

while((longueur_ecriture = write_atomic(	while((longueur_ecriture = write_atomic(
Line 651 lancement_thread(void *argument)	Line 668 lancement_thread(void *argument)

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

	(*s_etat_processus).erreur_systeme = d_es_signal;
	pthread_exit(NULL);
	}

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

(*s_etat_processus).erreur_systeme = d_es_signal;	(*s_etat_processus).erreur_systeme = d_es_signal;
exit(EXIT_FAILURE);	pthread_exit(NULL);
}	}
}	}
}	}
Line 675 lancement_thread(void *argument)	Line 702 lancement_thread(void *argument)
pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));	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);	pthread_exit(NULL);
}	}

if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)	if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
Line 689 lancement_thread(void *argument)	Line 716 lancement_thread(void *argument)
pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));	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);	pthread_exit(NULL);
}	}

pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
Line 1022 lancement_thread(void *argument)	Line 1049 lancement_thread(void *argument)
pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux));	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);
liberation_allocateur(s_etat_processus);	liberation_allocateur(s_etat_processus);
Line 1040 lancement_thread(void *argument)	Line 1077 lancement_thread(void *argument)
pthread_mutex_unlock(&((*s_argument_thread).mutex));	pthread_mutex_unlock(&((*s_argument_thread).mutex));

pthread_exit(NULL);	pthread_exit(NULL);
return(NULL);
}	}

// vim: ts=4	// vim: ts=4

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.95
changed lines
	Added in v.1.117