--- rpl/src/gestion_threads.c 2013/05/22 09:05:20 1.80 +++ rpl/src/gestion_threads.c 2014/04/25 07:37:29 1.88 @@ -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.18 + Copyright (C) 1989-2014 Dr. BERTRAND Joël This file is part of RPL/2. @@ -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); @@ -664,18 +670,34 @@ lancement_thread(void *argument) } } - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + if (pthread_mutex_lock(&((*s_etat_processus).mutex_interruptions)) != 0) + { + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); + + (*s_etat_processus).erreur_systeme = d_es_processus; + exit(EXIT_FAILURE); + } 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) + { + 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_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; @@ -996,8 +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)); @@ -1011,9 +1035,9 @@ lancement_thread(void *argument) free(s_etat_processus); pthread_mutex_lock(&((*s_argument_thread).mutex)); + (*s_argument_thread).thread_actif = d_faux; pthread_mutex_unlock(&((*s_argument_thread).mutex)); - (*s_argument_thread).thread_actif = d_faux; pthread_exit(NULL); return(NULL); }