rpl/src/rpl.c - diff

Return to rpl.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/rpl.c between versions 1.197 and 1.211

version 1.197, 2017/07/30 21:59:41	version 1.211, 2019/02/17 16:08:41
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.27	RPL/2 (R) version 4.1.31
Copyright (C) 1989-2017 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 127 rplinit(int argc, char argv[], char en	Line 127 rplinit(int argc, char argv[], char en
errno = 0;	errno = 0;
s_queue_signaux = NULL;	s_queue_signaux = NULL;
routine_recursive = 0;	routine_recursive = 0;
nombre_thread_surveillance_processus = 0;	nombre_threads_surveillance_processus = 0;
pid_processus_pere = getpid();	pid_processus_pere = getpid();

# ifdef DEBUG_PROC	# ifdef DEBUG_PROC
Line 313 rplinit(int argc, char argv[], char en	Line 313 rplinit(int argc, char argv[], char en
pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);	pthread_mutex_init(&mutex_liste_threads, &attributs_mutex);
pthread_mutexattr_destroy(&attributs_mutex);	pthread_mutexattr_destroy(&attributs_mutex);

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

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);	sem_init(&((*s_etat_processus).semaphore_fork), 0, 0);
# else	# else
Line 449 rplinit(int argc, char argv[], char en	Line 454 rplinit(int argc, char argv[], char en

if ((*s_etat_processus).langue == 'F')	if ((*s_etat_processus).langue == 'F')
{	{
printf("+++Copyright (C) 1989 à 2016, 2017 BERTRAND Joël\n");	printf("+++Copyright (C) 1989 à 2018, 2019 BERTRAND Joël\n");
}	}
else	else
{	{
printf("+++Copyright (C) 1989 to 2016, 2017 BERTRAND Joel\n");	printf("+++Copyright (C) 1989 to 2018, 2019 BERTRAND Joel\n");
}	}
}	}

Line 5433 rplinit(int argc, char argv[], char en	Line 5438 rplinit(int argc, char argv[], char en
if ((*s_etat_processus).var_volatile_alarme	if ((*s_etat_processus).var_volatile_alarme
!= 0)	!= 0)
{	{
envoi_signal_thread(	envoi_signal_thread(s_etat_processus,
((((struct_processus_fils *)	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee).objet))	l_element_courant)).donnee).objet))
Line 5444 rplinit(int argc, char argv[], char en	Line 5449 rplinit(int argc, char argv[], char en
if ((*s_etat_processus).arret_depuis_abort	if ((*s_etat_processus).arret_depuis_abort
== -1)	== -1)
{	{
envoi_signal_thread(	envoi_signal_thread(s_etat_processus,
((((struct_processus_fils *)	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee)	l_element_courant)).donnee)
Line 5453 rplinit(int argc, char argv[], char en	Line 5458 rplinit(int argc, char argv[], char en
}	}
else	else
{	{
envoi_signal_thread(	envoi_signal_thread(s_etat_processus,
((((struct_processus_fils *)	((((struct_processus_fils *)
((((struct_liste_chainee *)	((((struct_liste_chainee *)
l_element_courant)).donnee)	l_element_courant)).donnee)
Line 6110 rplinit(int argc, char argv[], char en	Line 6115 rplinit(int argc, char argv[], char en
attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

while(nombre_thread_surveillance_processus != 0)	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));

	while(nombre_threads_surveillance_processus != 0)
	{
	pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus));
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus));
	}

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

	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

	while(pthread_mutex_trylock(&((*s_etat_processus).mutex_pile_processus))
	== EBUSY)
{	{
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	INCR_GRANULARITE(attente.tv_nsec);
}	}

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

	free((*s_etat_processus).localisation);

	destruction_queue_signaux(s_etat_processus);
	pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux));
	liberation_contexte_cas(s_etat_processus);

# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));
sem_destroy(&((*s_etat_processus).semaphore_fork));	sem_destroy(&((*s_etat_processus).semaphore_fork));
Line 6132 rplinit(int argc, char argv[], char en	Line 6159 rplinit(int argc, char argv[], char en
SEM_FORK);	SEM_FORK);
# endif	# endif

free((*s_etat_processus).localisation);

destruction_queue_signaux(s_etat_processus);
liberation_contexte_cas(s_etat_processus);

free((*s_etat_processus).chemin_fichiers_temporaires);	free((*s_etat_processus).chemin_fichiers_temporaires);

if ((*s_etat_processus).requete_redemarrage == d_vrai)	if ((*s_etat_processus).requete_redemarrage == d_vrai)
Line 6153 rplinit(int argc, char argv[], char en	Line 6175 rplinit(int argc, char argv[], char en

liberation_allocateur_buffer(s_etat_processus);	liberation_allocateur_buffer(s_etat_processus);
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer));	pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer));
	pthread_mutex_destroy(&mutex_liste_threads);
	pthread_mutex_destroy(&mutex_sigaction);

sys_free(s_etat_processus);	sys_free(s_etat_processus);
sys_free(arg_exec);	sys_free(arg_exec);

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.197
changed lines
	Added in v.1.211