--- rpl/src/instructions_w1.c	2013/04/01 15:29:38	1.82
+++ rpl/src/instructions_w1.c	2015/02/19 11:01:28	1.95
@@ -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.21
+  Copyright (C) 1989-2015 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);
@@ -698,7 +712,8 @@ instruction_write(struct_processus *s_et
 
 				free(chaine);
 
-				if (alsprintf(&commande, "insert or replace into data "
+				if (alsprintf(s_etat_processus, &commande,
+						"insert or replace into data "
 						"(id, data) values (%lld, '%s')", (*((integer8 *)
 						(*s_objet_argument_2).objet)), chaine_utf8) < 0)
 				{
@@ -748,8 +763,8 @@ instruction_write(struct_processus *s_et
 
 				// Récupération de la position de la clef
 
-				if (alsprintf(&commande, "select key from control "
-						"where id = 1") < 0)
+				if (alsprintf(s_etat_processus, &commande,
+						"select key from control where id = 1") < 0)
 				{
 					(*s_etat_processus).erreur_systeme =
 							d_es_allocation_memoire;
@@ -925,8 +940,8 @@ instruction_write(struct_processus *s_et
 
 				// Récupération de l'identifiant de la clef
 
-				if (alsprintf(&commande, "select id from key where key = "
-						"'%s'", clef_utf8) < 0)
+				if (alsprintf(s_etat_processus, &commande,
+						"select id from key where key = '%s'", clef_utf8) < 0)
 				{
 					(*s_etat_processus).erreur_systeme =
 							d_es_allocation_memoire;
@@ -971,8 +986,9 @@ instruction_write(struct_processus *s_et
 
 							free(commande);
 
-							if (alsprintf(&commande, "insert into key "
-									"(key) values ('%s')", clef_utf8) < 0)
+							if (alsprintf(s_etat_processus, &commande,
+									"insert into key (key) values ('%s')",
+									clef_utf8) < 0)
 							{
 								(*s_etat_processus).erreur_systeme =
 										d_es_allocation_memoire;
@@ -1005,8 +1021,9 @@ instruction_write(struct_processus *s_et
 
 							free(commande);
 
-							if (alsprintf(&commande, "select id from key "
-									"where key = '%s'", clef_utf8) < 0)
+							if (alsprintf(s_etat_processus, &commande,
+									"select id from key where key = '%s'",
+									clef_utf8) < 0)
 							{
 								(*s_etat_processus).erreur_systeme =
 										d_es_allocation_memoire;
@@ -1069,8 +1086,9 @@ instruction_write(struct_processus *s_et
 
 				if (mise_a_jour == d_vrai)
 				{
-					if (alsprintf(&commande, "update key set key = '%s' where "
-							"id = %lld", clef_utf8, id) < 0)
+					if (alsprintf(s_etat_processus, &commande,
+							"update key set key = '%s' where id = %lld",
+							clef_utf8, id) < 0)
 					{
 						(*s_etat_processus).erreur_systeme =
 								d_es_allocation_memoire;
@@ -1105,8 +1123,8 @@ instruction_write(struct_processus *s_et
 
 				// Effacement de l'enregistrement existant
 
-				if (alsprintf(&commande, "delete from data where "
-						"key_id = %lld", id) < 0)
+				if (alsprintf(s_etat_processus, &commande,
+						"delete from data where key_id = %lld", id) < 0)
 				{
 					(*s_etat_processus).erreur_systeme =
 							d_es_allocation_memoire;
@@ -1240,8 +1258,8 @@ instruction_write(struct_processus *s_et
 
 					free(chaine);
 
-					if (alsprintf(&commande, "insert into data "
-							"(data, key_id, sequence) values "
+					if (alsprintf(s_etat_processus, &commande,
+							"insert into data (data, key_id, sequence) values "
 							"('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0)
 					{
 						(*s_etat_processus).erreur_systeme =
@@ -1480,9 +1498,9 @@ instruction_write(struct_processus *s_et
 						return;
 					}
 
-					if ((format_chaine = conversion_majuscule((unsigned char *)
-							(*(*l_element_courant_format).donnee).objet))
-							== NULL)
+					if ((format_chaine = conversion_majuscule(s_etat_processus,
+							(unsigned char *) (*(*l_element_courant_format)
+							.donnee).objet)) == NULL)
 					{
 						(*s_etat_processus).erreur_systeme =
 								d_es_allocation_memoire;
@@ -2197,8 +2215,8 @@ instruction_wflock(struct_processus *s_e
 
 		do
 		{
-			if ((chaine = conversion_majuscule((unsigned char *)
-					(*s_objet_argument_1).objet)) == NULL)
+			if ((chaine = conversion_majuscule(s_etat_processus,
+					(unsigned char *) (*s_objet_argument_1).objet)) == NULL)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_allocation_memoire;
 				return;
@@ -2279,13 +2297,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 +2430,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 +2496,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 +2577,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 +2599,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 +2667,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 +2690,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 +2794,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 +2855,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 +2899,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 +2941,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 +2980,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 +3008,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 +3693,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 +3844,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 +3963,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 =