--- rpl/src/instructions_w1.c	2013/05/23 12:45:08	1.83
+++ rpl/src/instructions_w1.c	2014/07/17 08:07:25	1.91
@@ -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.19
+  Copyright (C) 1989-2014 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -289,7 +289,8 @@ instruction_wait(struct_processus *s_eta
 
 			scrutation_injection(s_etat_processus);
 
-			if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)
+			if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -300,7 +301,8 @@ instruction_wait(struct_processus *s_eta
 				affectation_interruptions_logicielles(s_etat_processus);
 			}
 
-			if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+			if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -2291,7 +2293,8 @@ instruction_wflock(struct_processus *s_e
 			}
 			else
 			{
-				if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)
+				if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -2302,7 +2305,8 @@ instruction_wflock(struct_processus *s_e
 					affectation_interruptions_logicielles(s_etat_processus);
 				}
 
-				if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+				if (pthread_mutex_unlock(&(*s_etat_processus)
+						.mutex_interruptions) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -2422,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)
 			{
@@ -2487,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;
@@ -2567,13 +2573,46 @@ instruction_wfproc(struct_processus *s_e
 					 * Le processus n'est pas terminé
 					 */
 
+					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);
+						}
+
+						(*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)) != 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)
 						{
@@ -2624,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)
 						{
@@ -2646,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;
@@ -2749,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)
 			{
@@ -2809,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;
@@ -2852,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)
 						{
@@ -2893,7 +2937,8 @@ instruction_wfdata(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_interruptions) != 0)
 					{
 						(*s_etat_processus).erreur_systeme = d_es_processus;
 						return;
@@ -2905,7 +2950,8 @@ instruction_wfdata(struct_processus *s_e
 						affectation_interruptions_logicielles(s_etat_processus);
 					}
 
-					if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+					if (pthread_mutex_unlock(&(*s_etat_processus)
+							.mutex_interruptions) != 0)
 					{
 						(*s_etat_processus).erreur_systeme = d_es_processus;
 						return;
@@ -2930,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)
 						{
@@ -2957,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;
@@ -3641,7 +3689,8 @@ instruction_wfswi(struct_processus *s_et
 				return;
 			}
 
-			if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)
+			if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -3652,7 +3701,8 @@ instruction_wfswi(struct_processus *s_et
 				affectation_interruptions_logicielles(s_etat_processus);
 			}
 
-			if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+			if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions)
+					!= 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -3790,7 +3840,7 @@ instruction_wfpoke(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_interruptions) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -3801,7 +3851,7 @@ instruction_wfpoke(struct_processus *s_e
 			affectation_interruptions_logicielles(s_etat_processus);
 		}
 
-		if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+		if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -3909,7 +3959,7 @@ instruction_wfack(struct_processus *s_et
 	{
 		scrutation_injection(s_etat_processus);
 
-		if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0)
+		if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -3920,7 +3970,7 @@ instruction_wfack(struct_processus *s_et
 			affectation_interruptions_logicielles(s_etat_processus);
 		}
 
-		if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0)
+		if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;