--- rpl/src/rpl.h	2019/02/09 13:36:43	1.329
+++ rpl/src/rpl.h	2019/11/06 17:31:47	1.336
@@ -1,6 +1,6 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.31
+  RPL/2 (R) version 4.1.32
   Copyright (C) 1989-2019 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
@@ -325,7 +325,8 @@ enum signaux_rpl
 	rpl_sighup,
 	rpl_sigtstp,
 	rpl_sigexcept,
-	rpl_sigmax
+	rpl_sigmax,
+	rpl_siguser			// Base des signaux à la discrétion de l'utilisateur
 };
 
 #define	LONGUEUR_QUEUE_SIGNAUX			1024
@@ -394,8 +395,14 @@ union semun
 
 #ifdef IPCS_SYSV
 #	ifdef DEBUG_SEMAPHORES
+#		define sem_init(a, b, c) ({ \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+						"initialization at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_init_SysV(a, b, c); })
 #		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
-				if (strstr(#a, "fork") != NULL) \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"waiting at %s() " \
 				"line #%d <%d>\n", (int) getpid(), (unsigned long long) i\
@@ -403,7 +410,6 @@ union semun
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_wait_SysV(a); })
 #		define sem_trywait(a) ({ int value; sem_getvalue(a, &value); \
-				if (strstr(#a, "fork") != NULL) \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"trywaiting at %s() " \
 				"line #%d <%d>\n", (int) getpid(), (unsigned long long) i\
@@ -411,7 +417,6 @@ union semun
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_trywait_SysV(a); })
 #		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
-				if (strstr(#a, "fork") != NULL) \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"posting at %s() " \
 				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
@@ -419,7 +424,6 @@ union semun
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_post_SysV(a); })
 #		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
-				if (strstr(#a, "fork") != NULL) \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"destroying at %s() " \
 				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
@@ -442,6 +446,13 @@ union semun
 #	define sem_unlink(a)		sem_unlink_SysV(a)
 #else
 #	ifdef DEBUG_SEMAPHORES
+#		define sem_init(a, b, c) ({ \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+						"initialization at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, c), fflush(stdout); \
+				sem_init(a, b, c); })
 #		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"waiting at %s() " \
@@ -557,7 +568,9 @@ union semun
 
 	__EXTERN__ pid_t				pid_processus_pere;
 
+	__EXTERN__ pthread_mutex_t		mutex_sigaction;
 	__EXTERN__ pthread_mutex_t		mutex_liste_threads;
+	__EXTERN__ pthread_mutex_t		mutex_liste_threads_surveillance;
 	__EXTERN__ pthread_mutex_t		mutex_creation_variable_partagee
 											__STATIC_MUTEX_INITIALIZATION__;
 	__EXTERN__ pthread_mutex_t		mutex_sections_critiques;
@@ -565,7 +578,7 @@ union semun
 	__EXTERN__ pthread_mutex_t		mutex_sem __STATIC_MUTEX_INITIALIZATION__;
 
 	__EXTERN__ volatile int			routine_recursive;
-	__EXTERN__ volatile int			nombre_thread_surveillance_processus;
+	__EXTERN__ volatile int			nombre_threads_surveillance_processus;
 
 #	define SEM_FORK					0
 #	define SEM_QUEUE				1
@@ -1049,6 +1062,7 @@ pid_t debug_fork();
 #	define d_ex_taille_message					__erreur(92)
 #	define d_ex_type_externe_dup				__erreur(93)
 #	define d_ex_type_externe_drop				__erreur(94)
+#	define d_ex_simplification					__erreur(95)
 #endif
 
 
@@ -3547,6 +3561,8 @@ logical1 validation_chaine(unsigned char
 #ifndef RPLARGS
 ssize_t read_atomic(struct_processus *s_etat_processus,
 		int fd, void *buf, size_t count);
+ssize_t read_atomic_signal(struct_processus *s_etat_processus,
+		int fd, void *buf, size_t count);
 ssize_t write_atomic(struct_processus *s_etat_processus,
 		int fd, void *buf, size_t count);
 #endif