--- rpl/src/instructions_s9.c	2011/09/14 14:34:28	1.37
+++ rpl/src/instructions_s9.c	2011/09/14 17:55:59	1.38
@@ -854,19 +854,11 @@ instruction_suspend(struct_processus *s_
 		}
 	}
 
-#	ifndef SEMAPHORES_NOMMES
-	if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+	if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 	{
 		(*s_etat_processus).erreur_systeme = d_es_processus;
 		return;
 	}
-#	else
-	if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-	{
-		(*s_etat_processus).erreur_systeme = d_es_processus;
-		return;
-	}
-#	endif
 
 	for((*s_etat_processus).redemarrage_processus = d_faux;;)
 	{
@@ -881,17 +873,10 @@ instruction_suspend(struct_processus *s_
 		INCR_GRANULARITE(attente.tv_nsec);
 	}
 
-#	ifndef SEMAPHORES_NOMMES
-	while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#	else
-	while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#	endif
+	if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 	{
-		if (errno != EINTR)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
-		}
+		(*s_etat_processus).erreur_systeme = d_es_processus;
+		return;
 	}
 
 	if ((*s_etat_processus).profilage == d_vrai)
@@ -1250,35 +1235,20 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
-					if (errno != EINTR)
-					{
-						(*s_etat_processus).erreur_systeme = d_es_processus;
-						return;
-					}
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
 				}
 
 				if (longueur_ecriture == -1)
@@ -1303,28 +1273,18 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-#				endif
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
 			}
 
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 		}
 		else
@@ -1334,35 +1294,20 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
-#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_objets_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
-					if (errno != EINTR)
-					{
-						(*s_etat_processus).erreur_systeme = d_es_processus;
-						return;
-					}
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
 				}
 
 				if (longueur_ecriture == -1)
@@ -1387,32 +1332,18 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
-#				endif
 			}
 
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 		}
 
@@ -1421,36 +1352,21 @@ instruction_swi(struct_processus *s_etat
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
-#		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
-		}
-#		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
-#		endif
 
 		while((longueur_ecriture = write_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_interruptions,
 				&interruption_reduite, sizeof(interruption_reduite)))
 				!= sizeof(interruption_reduite))
 		{
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 
 			if (longueur_ecriture == -1)
@@ -1475,32 +1391,17 @@ instruction_swi(struct_processus *s_etat
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
 		}
 
-#		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#		endif
+		if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 		{
-			if (errno != EINTR)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
 		}
 
 		if ((*s_etat_processus).processus_detache == d_vrai)
@@ -1510,29 +1411,17 @@ instruction_swi(struct_processus *s_etat
 			attente.tv_sec = 0;
 			attente.tv_nsec = GRANULARITE_us * 1000;
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
@@ -1560,19 +1449,12 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
-#				endif
 			}
 
 			pid = getpid();
@@ -1584,17 +1466,10 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&pid, sizeof(pid))) != sizeof(pid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
-					if (errno != EINTR)
-					{
-						(*s_etat_processus).erreur_systeme = d_es_processus;
-						return;
-					}
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
 				}
 
 				if (longueur_ecriture == -1)
@@ -1619,67 +1494,38 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
-#				endif
 			}
 
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 		}
 		else
 		{
 			tid = -3;
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
-#			endif
 
 			while((longueur_ecriture = write_atomic(s_etat_processus,
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
-					if (errno != EINTR)
-					{
-						(*s_etat_processus).erreur_systeme = d_es_processus;
-						return;
-					}
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
 				}
 
 				if (longueur_ecriture == -1)
@@ -1704,19 +1550,12 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
-#				endif
 			}
 
 			tid = pthread_self();
@@ -1728,17 +1567,10 @@ instruction_swi(struct_processus *s_etat
 					(*s_etat_processus).pipe_nombre_interruptions_attente,
 					&tid, sizeof(tid))) != sizeof(tid))
 			{
-#				ifndef SEMAPHORES_NOMMES
-				while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#				else
-				while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#				endif
+				if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 				{
-					if (errno != EINTR)
-					{
-						(*s_etat_processus).erreur_systeme = d_es_processus;
-						return;
-					}
+					(*s_etat_processus).erreur_systeme = d_es_processus;
+					return;
 				}
 
 				if (longueur_ecriture == -1)
@@ -1764,94 +1596,54 @@ instruction_swi(struct_processus *s_etat
 				nanosleep(&attente, NULL);
 				INCR_GRANULARITE(attente.tv_nsec);
 
-#				ifndef SEMAPHORES_NOMMES
-				if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
-#				else
-				if (sem_post((*s_etat_processus).semaphore_fork) != 0)
+				if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork))
+						!= 0)
 				{
 					(*s_etat_processus).erreur_systeme = d_es_processus;
 					return;
 				}
-#				endif
 			}
 
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 		}
 
 		attente.tv_sec = 0;
 		attente.tv_nsec = GRANULARITE_us * 1000;
 
-#		ifndef SEMAPHORES_NOMMES
-		if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
+		if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 		{
 			(*s_etat_processus).erreur_systeme = d_es_processus;
 			return;
 		}
-#		else
-		if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-		{
-			(*s_etat_processus).erreur_systeme = d_es_processus;
-			return;
-		}
-#		endif
 
 		while(read_atomic(s_etat_processus,
 				(*s_etat_processus).pipe_acquittement,
 				&tampon, sizeof(unsigned char)) != sizeof(unsigned char))
 		{
-#			ifndef SEMAPHORES_NOMMES
-			while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#			else
-			while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#			endif
+			if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
-				if (errno != EINTR)
-				{
-					(*s_etat_processus).erreur_systeme = d_es_processus;
-					return;
-				}
+				(*s_etat_processus).erreur_systeme = d_es_processus;
+				return;
 			}
 
 			nanosleep(&attente, NULL);
 			INCR_GRANULARITE(attente.tv_nsec);
 
-#			ifndef SEMAPHORES_NOMMES
-			if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0)
-#			else
-			if (sem_post((*s_etat_processus).semaphore_fork) != 0)
-#			endif
+			if (pthread_mutex_unlock(&((*s_etat_processus).mutex_fork)) != 0)
 			{
 				(*s_etat_processus).erreur_systeme = d_es_processus;
 				return;
 			}
 		}
 
-#		ifndef SEMAPHORES_NOMMES
-		while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1)
-#		else
-		while(sem_wait((*s_etat_processus).semaphore_fork) == -1)
-#		endif
+		if (pthread_mutex_lock(&((*s_etat_processus).mutex_fork)) != 0)
 		{
-			if (errno != EINTR)
-			{
-				(*s_etat_processus).erreur_systeme = d_es_processus;
-				return;
-			}
+			(*s_etat_processus).erreur_systeme = d_es_processus;
+			return;
 		}
 
 		if (registre == 0)