--- rpl/src/instructions_w1.c	2013/04/01 15:29:38	1.82
+++ rpl/src/instructions_w1.c	2014/04/25 07:37:33	1.90
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.14
-  Copyright (C) 1989-2013 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.18
+  Copyright (C) 1989-2014 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -289,11 +289,25 @@ instruction_wait(struct_processus *s_eta
 
 			scrutation_injection(s_etat_processus);
 
+			if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+
 			if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
 			{
 				affectation_interruptions_logicielles(s_etat_processus);
 			}
 
+			if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+
 			if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 			{
 				traitement_interruptions_logicielles(s_etat_processus);
@@ -2279,13 +2293,26 @@ instruction_wflock(struct_processus *s_e
 			}
 			else
 			{
+				if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+						!= 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+
 				if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
 				{
 					affectation_interruptions_logicielles(s_etat_processus);
 				}
 
-				if ((*s_etat_processus).nombre_interruptions_en_queue
-						!= 0)
+				if (pthread_mutex_unlock(&(*s_etat_processus)
+						.mutex_interruptions) != 0)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
+
+				if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 				{
 					registre_instruction_valide =
 							(*s_etat_processus).instruction_valide;
@@ -2399,7 +2426,8 @@ instruction_wfproc(struct_processus *s_e
 			}
 		}
 
-		if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)
+		if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
+				!= 0)
 		{
 			if ((*s_etat_processus).profilage == d_vrai)
 			{
@@ -2464,7 +2492,8 @@ instruction_wfproc(struct_processus *s_e
 					profilage(s_etat_processus, NULL);
 				}
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus)
+						.mutex_pile_processus)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -2544,8 +2573,12 @@ instruction_wfproc(struct_processus *s_e
 					 * Le processus n'est pas terminé
 					 */
 
-					if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+					if (pthread_mutex_lock(&((*s_etat_processus)
+							.mutex_interruptions)) != 0)
 					{
+						pthread_mutex_unlock(&((*s_etat_processus)
+								.mutex_pile_processus));
+
 						if ((*s_etat_processus).profilage == d_vrai)
 						{
 							profilage(s_etat_processus, NULL);
@@ -2562,8 +2595,36 @@ instruction_wfproc(struct_processus *s_e
 						affectation_interruptions_logicielles(s_etat_processus);
 					}
 
-					if ((*s_etat_processus).nombre_interruptions_en_queue
-							!= 0)
+					if (pthread_mutex_unlock(&((*s_etat_processus)
+							.mutex_interruptions)) != 0)
+					{
+						pthread_mutex_unlock(&((*s_etat_processus)
+								.mutex_pile_processus));
+
+						if ((*s_etat_processus).profilage == d_vrai)
+						{
+							profilage(s_etat_processus, NULL);
+						}
+
+						(*s_etat_processus).erreur_systeme =
+								d_es_processus;
+						return;
+					}
+
+					if (pthread_mutex_unlock(&((*s_etat_processus)
+							.mutex_pile_processus)) != 0)
+					{
+						if ((*s_etat_processus).profilage == d_vrai)
+						{
+							profilage(s_etat_processus, NULL);
+						}
+
+						(*s_etat_processus).erreur_systeme =
+								d_es_processus;
+						return;
+					}
+
+					if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 					{
 						registre_instruction_valide =
 								(*s_etat_processus).instruction_valide;
@@ -2602,7 +2663,8 @@ instruction_wfproc(struct_processus *s_e
 
 					scrutation_injection(s_etat_processus);
 
-					if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)
+					if (pthread_mutex_lock(&((*s_etat_processus)
+							.mutex_pile_processus)) != 0)
 					{
 						if ((*s_etat_processus).profilage == d_vrai)
 						{
@@ -2624,7 +2686,8 @@ instruction_wfproc(struct_processus *s_e
 			profilage(s_etat_processus, NULL);
 		}
 
-		if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
+				!= 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -2727,7 +2790,8 @@ instruction_wfdata(struct_processus *s_e
 			}
 		}
 
-		if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)
+		if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus))
+				!= 0)
 		{
 			if ((*s_etat_processus).profilage == d_vrai)
 			{
@@ -2787,7 +2851,8 @@ instruction_wfdata(struct_processus *s_e
 					profilage(s_etat_processus, NULL);
 				}
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus)
+						.mutex_pile_processus)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -2830,7 +2895,8 @@ instruction_wfdata(struct_processus *s_e
 						return;
 					}
 
-					if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+					if (pthread_mutex_unlock(&((*s_etat_processus)
+							.mutex_pile_processus)) != 0)
 					{
 						if ((*s_etat_processus).profilage == d_vrai)
 						{
@@ -2871,12 +2937,26 @@ instruction_wfdata(struct_processus *s_e
 
 					scrutation_injection(s_etat_processus);
 
+					if (pthread_mutex_lock(&(*s_etat_processus)
+							.mutex_interruptions) != 0)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
+
 					if ((*s_etat_processus).nombre_interruptions_non_affectees
 							!= 0)
 					{
 						affectation_interruptions_logicielles(s_etat_processus);
 					}
 
+					if (pthread_mutex_unlock(&(*s_etat_processus)
+							.mutex_interruptions) != 0)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
+
 					if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 					{
 						registre_instruction_valide =
@@ -2896,7 +2976,8 @@ instruction_wfdata(struct_processus *s_e
 						return;
 					}
 
-					if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0)
+					if (pthread_mutex_lock(&((*s_etat_processus)
+							.mutex_pile_processus)) != 0)
 					{
 						if ((*s_etat_processus).profilage == d_vrai)
 						{
@@ -2923,7 +3004,8 @@ instruction_wfdata(struct_processus *s_e
 			profilage(s_etat_processus, NULL);
 		}
 
-		if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0)
+		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus))
+				!= 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -3607,11 +3689,25 @@ instruction_wfswi(struct_processus *s_et
 				return;
 			}
 
+			if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+
 			if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
 			{
 				affectation_interruptions_logicielles(s_etat_processus);
 			}
 
+			if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
+
 			if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0)
 			{
 				drapeau_fin = d_vrai;
@@ -3744,11 +3840,23 @@ instruction_wfpoke(struct_processus *s_e
 
 		scrutation_injection(s_etat_processus);
 
+		if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
 		if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
 		{
 			affectation_interruptions_logicielles(s_etat_processus);
 		}
 
+		if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
 		if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 		{
 			registre_instruction_valide =
@@ -3851,11 +3959,23 @@ instruction_wfack(struct_processus *s_et
 	{
 		scrutation_injection(s_etat_processus);
 
+		if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
 		if ((*s_etat_processus).nombre_interruptions_non_affectees != 0)
 		{
 			affectation_interruptions_logicielles(s_etat_processus);
 		}
 
+		if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
+
 		if ((*s_etat_processus).nombre_interruptions_en_queue != 0)
 		{
 			registre_instruction_valide =