--- rpl/src/interruptions.c	2019/02/03 14:41:25	1.200
+++ rpl/src/interruptions.c	2019/02/09 13:36:42	1.201
@@ -217,6 +217,10 @@ modification_pid_thread_pere(struct_proc
 void
 insertion_thread(struct_processus *s_etat_processus, logical1 thread_principal)
 {
+	int											ios;
+
+	struct timespec								attente;
+
 	volatile struct_liste_chainee_volatile		*l_nouvel_objet;
 
 	if ((l_nouvel_objet = malloc(sizeof(struct_liste_chainee_volatile)))
@@ -239,10 +243,34 @@ insertion_thread(struct_processus *s_eta
 	(*((struct_thread *) (*l_nouvel_objet).donnee)).s_etat_processus =
 			s_etat_processus;
 
-	if (pthread_mutex_lock(&mutex_liste_threads) != 0)
+	attente.tv_sec = 0;
+	attente.tv_nsec = GRANULARITE_us * 1000;
+
+	while((ios = pthread_mutex_trylock(&mutex_liste_threads)) != 0)
 	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
+		if (ios != EBUSY)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		nanosleep(&attente, NULL);
+		INCR_GRANULARITE(attente.tv_nsec);
+
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			if (errno != EINTR)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+		}
 	}
 
 	(*l_nouvel_objet).suivant = liste_threads;
@@ -297,13 +325,41 @@ insertion_thread_surveillance(struct_pro
 void
 retrait_thread(struct_processus *s_etat_processus)
 {
+	int										ios;
+
+	struct timespec							attente;
+
 	volatile struct_liste_chainee_volatile	*l_element_precedent;
 	volatile struct_liste_chainee_volatile	*l_element_courant;
 
-	if (pthread_mutex_lock(&mutex_liste_threads) != 0)
+	attente.tv_sec = 0;
+	attente.tv_nsec = GRANULARITE_us * 1000;
+
+	while((ios = pthread_mutex_trylock(&mutex_liste_threads)) != 0)
 	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
+		if (ios != EBUSY)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		nanosleep(&attente, NULL);
+		INCR_GRANULARITE(attente.tv_nsec);
+
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			if (errno != EINTR)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+		}
 	}
 
 	l_element_precedent = NULL;
@@ -468,12 +524,40 @@ retrait_thread_surveillance(struct_proce
 void
 verrouillage_threads_concurrents(struct_processus *s_etat_processus)
 {
+	int										ios;
+
+	struct timespec							attente;
+
 	volatile struct_liste_chainee_volatile	*l_element_courant;
 
-	if (pthread_mutex_lock(&mutex_liste_threads) != 0)
+	attente.tv_sec = 0;
+	attente.tv_nsec = GRANULARITE_us * 1000;
+
+	while((ios = pthread_mutex_trylock(&mutex_liste_threads)) != 0)
 	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
+		if (ios != EBUSY)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
+		nanosleep(&attente, NULL);
+		INCR_GRANULARITE(attente.tv_nsec);
+
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+		{
+			if (errno != EINTR)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+		}
 	}
 
 	l_element_courant = liste_threads;
@@ -492,8 +576,11 @@ verrouillage_threads_concurrents(struct_
 						.donnee)).s_etat_processus).semaphore_fork) == -1)
 #			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 		}
 
@@ -1902,7 +1989,7 @@ inline static void
 signal_int(struct_processus *s_etat_processus, pid_t pid)
 {
 	struct_processus		*s_thread_principal;
-	volatile sig_atomic_t	exclusion = 0;
+	pthread_mutex_t			exclusion = PTHREAD_MUTEX_INITIALIZER;
 
 	verrouillage_gestionnaire_signaux(s_etat_processus);
 
@@ -1924,13 +2011,12 @@ signal_int(struct_processus *s_etat_proc
 		{
 			(*s_etat_processus).var_volatile_traitement_sigint = -1;
 
-			while(exclusion == 1);
-			exclusion = 1;
+			pthread_mutex_lock(&exclusion);
 
 			if ((*s_etat_processus).var_volatile_requete_arret == -1)
 			{
 				deverrouillage_gestionnaire_signaux(s_etat_processus);
-				exclusion = 0;
+				pthread_mutex_unlock(&exclusion);
 				return;
 			}
 
@@ -1948,7 +2034,7 @@ signal_int(struct_processus *s_etat_proc
 			(*s_etat_processus).var_volatile_requete_arret = -1;
 			(*s_etat_processus).var_volatile_alarme = -1;
 
-			exclusion = 0;
+			pthread_mutex_unlock(&exclusion);
 		}
 	}
 	else
@@ -3103,17 +3189,54 @@ envoi_signal_processus(pid_t pid, enum s
 }
 
 int
-envoi_signal_thread(pthread_t tid, enum signaux_rpl signal)
+envoi_signal_thread(struct_processus *s_contexte,
+		pthread_t tid, enum signaux_rpl signal)
 {
 	// Un signal est envoyé d'un thread à un autre thread du même processus.
 
+	int										ios;
+
+	struct timespec							attente;
+
 	volatile struct_liste_chainee_volatile	*l_element_courant;
 
 	struct_processus						*s_etat_processus;
 
-	if (pthread_mutex_lock(&mutex_liste_threads) != 0)
+	if (s_contexte != NULL)
 	{
-		return(1);
+		attente.tv_sec = 0;
+		attente.tv_nsec = GRANULARITE_us * 1000;
+
+		while((ios = pthread_mutex_trylock(&mutex_liste_threads)) != 0)
+		{
+			if (ios != EBUSY)
+			{
+				return(1);
+			}
+
+			if (sem_post(&((*s_contexte).semaphore_fork)) != 0)
+			{
+				return(1);
+			}
+
+			nanosleep(&attente, NULL);
+			INCR_GRANULARITE(attente.tv_nsec);
+
+			while(sem_wait(&((*s_contexte).semaphore_fork)) != 0)
+			{
+				if (errno != EINTR)
+				{
+					return(1);
+				}
+			}
+		}
+	}
+	else
+	{
+		if (pthread_mutex_lock(&mutex_liste_threads) != 0)
+		{
+			return(1);
+		}
 	}
 
 	l_element_courant = liste_threads;