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.184 and 1.193

version 1.184, 2016/03/22 18:51:54	version 1.193, 2017/06/28 09:20:38
Line 1	Line 1
/*	/*
================================================================================	================================================================================
RPL/2 (R) version 4.1.25	RPL/2 (R) version 4.1.27
Copyright (C) 1989-2016 Dr. BERTRAND Joël	Copyright (C) 1989-2017 Dr. BERTRAND Joël

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

Line 126 rplinit(int argc, char argv[], char en	Line 126 rplinit(int argc, char argv[], char en
nombre_thread_surveillance_processus = 0;	nombre_thread_surveillance_processus = 0;
pid_processus_pere = getpid();	pid_processus_pere = getpid();

	# ifdef DEBUG_PROC
	__proc = 0;
	# endif

# ifdef DEBUG_MEMOIRE	# ifdef DEBUG_MEMOIRE
debug_memoire_initialisation();	debug_memoire_initialisation();
# endif	# endif
Line 441 rplinit(int argc, char argv[], char en	Line 445 rplinit(int argc, char argv[], char en

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

Line 672 rplinit(int argc, char argv[], char en	Line 676 rplinit(int argc, char argv[], char en
return(EXIT_FAILURE);	return(EXIT_FAILURE);
}	}

if (sigaction(SIGALRM, &action, NULL) != 0)	if (sigaction(SIGUSR2, &action, NULL) != 0)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));
Line 706 rplinit(int argc, char argv[], char en	Line 710 rplinit(int argc, char argv[], char en
}	}

signal_test = SIGTEST;	signal_test = SIGTEST;
raise(SIGALRM);	raise(SIGUSR2);

attente.tv_sec = 0;	attente.tv_sec = 0;
attente.tv_nsec = 1000000;	attente.tv_nsec = 1000000;
Line 716 rplinit(int argc, char argv[], char en	Line 720 rplinit(int argc, char argv[], char en
nanosleep(&attente, NULL);	nanosleep(&attente, NULL);
}	}

if (signal_test != SIGALRM)	if (signal_test != SIGUSR2)
{	{
# ifndef SEMAPHORES_NOMMES	# ifndef SEMAPHORES_NOMMES
sem_post(&((*s_etat_processus).semaphore_fork));	sem_post(&((*s_etat_processus).semaphore_fork));
Line 5697 rplinit(int argc, char argv[], char en	Line 5701 rplinit(int argc, char argv[], char en

retrait_thread(s_etat_processus);	retrait_thread(s_etat_processus);

while(nombre_thread_surveillance_processus != 0);	attente.tv_sec = 0;
	attente.tv_nsec = GRANULARITE_us * 1000;

	while(nombre_thread_surveillance_processus != 0)
	{
	nanosleep(&attente, NULL);
	INCR_GRANULARITE(attente.tv_nsec);
	}

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));

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.184
changed lines
	Added in v.1.193