--- rpl/src/rpl.c 2019/02/11 09:45:52 1.210 +++ rpl/src/rpl.c 2019/10/31 15:40:23 1.213 @@ -1,6 +1,6 @@ /* ================================================================================ - RPL/2 (R) version 4.1.31 + RPL/2 (R) version 4.1.32 Copyright (C) 1989-2019 Dr. BERTRAND Joël This file is part of RPL/2. @@ -127,7 +127,7 @@ rplinit(int argc, char *argv[], char *en errno = 0; s_queue_signaux = NULL; routine_recursive = 0; - nombre_thread_surveillance_processus = 0; + nombre_threads_surveillance_processus = 0; pid_processus_pere = getpid(); # ifdef DEBUG_PROC @@ -315,29 +315,34 @@ rplinit(int argc, char *argv[], char *en pthread_mutexattr_init(&attributs_mutex); pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&mutex_liste_threads_surveillance, &attributs_mutex); + pthread_mutexattr_destroy(&attributs_mutex); + + pthread_mutexattr_init(&attributs_mutex); + pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init(&mutex_sigaction, &attributs_mutex); pthread_mutexattr_destroy(&attributs_mutex); # ifndef SEMAPHORES_NOMMES - sem_init(&((*s_etat_processus).semaphore_fork), 0, 0); + if (sem_init(&((*s_etat_processus).semaphore_fork), 0, 0) != 0) # else if (((*s_etat_processus).semaphore_fork = sem_init3(0, getpid(), pthread_self(), SEM_FORK)) == SEM_FAILED) - { - liberation_contexte_cas(s_etat_processus); - - if ((*s_etat_processus).langue == 'F') - { - uprintf("+++Système : Mémoire insuffisante\n"); - } - else - { - uprintf("+++System : Not enough memory\n"); - } +# endif + { + liberation_contexte_cas(s_etat_processus); - return(EXIT_FAILURE); + if ((*s_etat_processus).langue == 'F') + { + uprintf("+++Système : Mémoire insuffisante\n"); } -# endif + else + { + uprintf("+++System : Not enough memory\n"); + } + + return(EXIT_FAILURE); + } pthread_mutexattr_init(&attributs_mutex); pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL); @@ -6117,7 +6122,7 @@ rplinit(int argc, char *argv[], char *en pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)); - while(nombre_thread_surveillance_processus != 0) + while(nombre_threads_surveillance_processus != 0) { pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); nanosleep(&attente, NULL); @@ -6176,6 +6181,7 @@ rplinit(int argc, char *argv[], char *en liberation_allocateur_buffer(s_etat_processus); pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer)); pthread_mutex_destroy(&mutex_liste_threads); + pthread_mutex_destroy(&mutex_liste_threads_surveillance); pthread_mutex_destroy(&mutex_sigaction); sys_free(s_etat_processus);