--- rpl/src/gestion_threads.c 2013/05/28 22:09:55 1.82 +++ rpl/src/gestion_threads.c 2013/05/30 09:41:41 1.83 @@ -380,7 +380,7 @@ lancement_thread(void *argument) l_element_courant = l_element_suivant; } - pthread_mutex_lock(&((*s_etat_processus).mutex)); + pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)); l_element_courant = (struct_liste_chainee *) (*s_etat_processus).l_base_pile_processus; @@ -466,7 +466,8 @@ lancement_thread(void *argument) (*(*l_element_courant).donnee).objet)).thread).mutex)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; pthread_mutex_lock(&((*s_argument_thread).mutex)); @@ -490,7 +491,8 @@ lancement_thread(void *argument) (*(*l_element_courant).donnee).objet)).thread) .mutex)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; pthread_mutex_lock(&((*s_argument_thread).mutex)); @@ -507,7 +509,8 @@ lancement_thread(void *argument) (*(*l_element_courant).donnee).objet)).thread).mutex)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; pthread_mutex_lock(&((*s_argument_thread).mutex)); @@ -540,7 +543,8 @@ lancement_thread(void *argument) (*(*l_element_courant).donnee).objet)).thread).mutex)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; pthread_mutex_lock(&((*s_argument_thread).mutex)); @@ -595,7 +599,8 @@ lancement_thread(void *argument) if (sigaction(SIGPIPE, &action, ®istre) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); if (registre_stop == 0) { @@ -646,7 +651,8 @@ lancement_thread(void *argument) if (sigaction(SIGPIPE, ®istre, NULL) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_signal; exit(EXIT_FAILURE); @@ -666,7 +672,7 @@ lancement_thread(void *argument) if (pthread_mutex_lock(&((*s_etat_processus).mutex_interruptions)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; exit(EXIT_FAILURE); @@ -680,18 +686,18 @@ lancement_thread(void *argument) if (pthread_mutex_unlock(&((*s_etat_processus).mutex_interruptions)) != 0) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; exit(EXIT_FAILURE); } - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); nanosleep(&attente, NULL); - pthread_mutex_lock(&((*s_etat_processus).mutex)); + pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)); } - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); l_element_courant = (*s_etat_processus).s_sockets; @@ -1012,9 +1018,10 @@ lancement_thread(void *argument) liberation_allocateur(s_etat_processus); retrait_thread(s_etat_processus); - pthread_mutex_destroy(&((*s_etat_processus).mutex)); + pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus)); pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions)); + pthread_mutex_destroy(&((*s_etat_processus).mutex_signaux)); # ifndef SEMAPHORES_NOMMES sem_destroy(&((*s_etat_processus).semaphore_fork));