--- rpl/src/instructions_s9.c	2011/09/14 17:55:59	1.38
+++ rpl/src/instructions_s9.c	2012/07/03 13:56:32	1.50
@@ -1,7 +1,7 @@
 /*
 ================================================================================
-  RPL/2 (R) version 4.1.3
-  Copyright (C) 1989-2011 Dr. BERTRAND Joël
+  RPL/2 (R) version 4.1.9
+  Copyright (C) 1989-2012 Dr. BERTRAND Joël
 
   This file is part of RPL/2.
 
@@ -854,7 +854,11 @@ instruction_suspend(struct_processus *s_
 		}
 	}
 
-	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#	ifndef SEMAPHORES_NOMMES
+		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#	else
+		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#	endif
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
 		return;
@@ -873,10 +877,17 @@ instruction_suspend(struct_processus *s_
 		INCR_GRANULARITE(attente.tv_nsec);
 	}
 
-	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#	ifndef SEMAPHORES_NOMMES
+		while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#	else
+		while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#	endif
 	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
+		if (errno != EINTR)
+		{
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
+		}
 	}
 
 	if ((*s_etat_processus).profilage == d_vrai)
@@ -1235,7 +1246,11 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -1245,10 +1260,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1273,28 +1295,44 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
 			}
 
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+			scrutation_interruptions(s_etat_processus);
+
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 		}
 		else
 		{
-			tid = -1;
+			tid = (pthread_t) -1;
 
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -1304,10 +1342,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1332,18 +1377,30 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
 			}
 
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+			scrutation_interruptions(s_etat_processus);
+
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 		}
 
@@ -1352,7 +1409,11 @@ instruction_swi(struct_processus *s_etat
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
-		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#		ifndef SEMAPHORES_NOMMES
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#		else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -1363,10 +1424,17 @@ instruction_swi(struct_processus *s_etat
 				&interruption_reduite, sizeof(interruption_reduite)))
 				!= sizeof(interruption_reduite))
 		{
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 
 			if (longueur_ecriture == -1)
@@ -1391,17 +1459,30 @@ instruction_swi(struct_processus *s_etat
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
-		if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#		ifndef SEMAPHORES_NOMMES
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#		else
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
+			if (errno != EINTR)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
 		}
 
 		if ((*s_etat_processus).processus_detache == d_vrai)
@@ -1411,7 +1492,11 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -1421,10 +1506,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1449,12 +1541,17 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+
+				scrutation_interruptions(s_etat_processus);
 			}
 
 			pid = getpid();
@@ -1466,10 +1563,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1494,25 +1598,39 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
 			}
 
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 		}
 		else
 		{
-			tid = -3;
+			tid = (pthread_t) -3;
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
@@ -1522,10 +1640,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1550,12 +1675,17 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+
+				scrutation_interruptions(s_etat_processus);
 			}
 
 			tid = pthread_self();
@@ -1567,10 +1697,17 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#				ifndef SEMAPHORES_NOMMES
+					while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
+					if (errno != EINTR)
+					{
+						(*s_etat_processus).erreur_systeme = d_es_processus;
+						return;
+					}
 				}
 
 				if (longueur_ecriture == -1)
@@ -1596,25 +1733,41 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
-						!= 0)
+#				ifndef SEMAPHORES_NOMMES
+					if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#				else
+					if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#				endif
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
+
+				scrutation_interruptions(s_etat_processus);
 			}
 
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 		}
 
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
-		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#		ifndef SEMAPHORES_NOMMES
+			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#		else
+			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
@@ -1624,26 +1777,46 @@ instruction_swi(struct_processus *s_etat
 				(*s_etat_processus).pipe_acquittement,
 				&tampon, sizeof(unsigned char)) != sizeof(unsigned char))
 		{
-			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
+				if (errno != EINTR)
+				{
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
+				}
 			}
 
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
-			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
+#			ifndef SEMAPHORES_NOMMES
+				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+#			else
+				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+#			endif
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
+
+			scrutation_interruptions(s_etat_processus);
 		}
 
-		if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
+#		ifndef SEMAPHORES_NOMMES
+			while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0)
+#		else
+			while(sem_wait((*s_etat_processus).semaphore_fork) != 0)
+#		endif
 		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
+			if (errno != EINTR)
+			{
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
+			}
 		}
 
 		if (registre == 0)