--- rpl/src/rpl.h	2019/02/06 14:23:26	1.327
+++ rpl/src/rpl.h	2019/02/28 12:40:44	1.333
@@ -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,6 +395,13 @@ 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); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"waiting at %s() " \
@@ -401,14 +409,26 @@ union semun
 						pthread_self(), \
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_wait_SysV(a); })
-#	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
+#		define sem_trywait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"trywaiting at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) i\
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_trywait_SysV(a); })
+#		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"posting at %s() " \
 				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
 						pthread_self(), \
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_post_SysV(a); })
-#	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+#		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"destroying at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
 				sem_destroy_SysV(a); })
 #	else
@@ -426,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() " \
@@ -433,6 +460,13 @@ union semun
 						pthread_self(), \
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_wait(a); })
+#		define sem_trywait(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"trywaiting at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_trywait(a); })
 #		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"posting at %s() " \
@@ -441,6 +475,11 @@ union semun
 				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_post(a); })
 #		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
+				uprintf("[%d-%llu] Semaphore %s (%p) "\
+				"destroying at %s() " \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
+						pthread_self(), \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
 				sem_destroy(a); })
 #	endif
@@ -529,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;
@@ -537,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
@@ -3282,7 +3323,8 @@ int envoi_signal_contexte(struct_process
 		enum signaux_rpl signal);
 int envoi_signal_processus(pid_t pid, enum signaux_rpl signal,
 		logical1 test_ouverture);
-int envoi_signal_thread(pthread_t tid, enum signaux_rpl signal);
+int envoi_signal_thread(struct_processus *s_etat_processus,
+		pthread_t tid, enum signaux_rpl signal);
 #endif
 
 /*