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.201 and 1.216

version 1.201, 2018/01/01 10:34:06	version 1.216, 2021/03/13 12:50:52
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.28	RPL/2 (R) version 4.1.33
Copyright (C) 1989-2017 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 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_liste_threads_surveillance, &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);	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)
{	# endif
liberation_contexte_cas(s_etat_processus);	{
	liberation_contexte_cas(s_etat_processus);
if ((*s_etat_processus).langue == 'F')
{
uprintf("+++Système : Mémoire insuffisante\n");
}
else
{
uprintf("+++System : Not enough memory\n");
}

return(EXIT_FAILURE);	if ((*s_etat_processus).langue == 'F')
	{
	uprintf("+++Système : Mémoire insuffisante\n");
	}
	else
	{
	uprintf("+++System : Not enough memory\n");
}	}
# endif
	return(EXIT_FAILURE);
	}

pthread_mutexattr_init(&attributs_mutex);	pthread_mutexattr_init(&attributs_mutex);
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);	pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL);
Line 449 rplinit(int argc, char argv[], char en	Line 459 rplinit(int argc, char argv[], char en

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

Line 5433 rplinit(int argc, char argv[], char en	Line 5443 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 5454 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 5463 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 6120 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);	nanosleep(&attente, NULL);
INCR_GRANULARITE(attente.tv_nsec);	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_sec = 0;
attente.tv_nsec = GRANULARITE_us * 1000;	attente.tv_nsec = GRANULARITE_us * 1000;

Line 6165 rplinit(int argc, char argv[], char en	Line 6181 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_liste_threads);
	pthread_mutex_destroy(&mutex_liste_threads_surveillance);
	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.201
changed lines
	Added in v.1.216