--- rpl/src/instructions_d5.c 2013/05/28 22:09:55 1.111 +++ rpl/src/instructions_d5.c 2015/10/22 18:37:09 1.134 @@ -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.23 + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -767,6 +767,7 @@ instruction_der(struct_processus *s_etat if ((s_objet_simplifie = simplification(s_etat_processus, s_objet_resultat)) == NULL) { + liberation(s_etat_processus, s_objet_resultat); return; } @@ -1081,7 +1082,19 @@ instruction_detach(struct_processus *s_e * Le mutex suivant permet de copier un contexte propre. */ - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + + if (pthread_mutex_lock(&mutex_liste_variables_partagees) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + + if (pthread_mutex_lock(&((*s_etat_processus).mutex_allocation_buffer)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -1098,6 +1111,13 @@ instruction_detach(struct_processus *s_e (*s_argument_thread).pid = fork(); deverrouillage_threads_concurrents(s_etat_processus); + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_allocation_buffer)) + != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + (*s_argument_thread).thread_pere = pthread_self(); (*s_argument_thread).processus_detache = d_vrai; @@ -1118,6 +1138,12 @@ instruction_detach(struct_processus *s_e * Processus père */ + if (pthread_mutex_unlock(&mutex_liste_variables_partagees) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if (variable_partagee == d_vrai) { liberation(s_etat_processus, s_copie); @@ -1255,13 +1281,24 @@ instruction_detach(struct_processus *s_e * Processus fils */ + pthread_mutex_destroy(&mutex_liste_variables_partagees); + + pthread_mutexattr_init(&attributs_mutex); + pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&mutex_liste_variables_partagees, &attributs_mutex); + pthread_mutexattr_destroy(&attributs_mutex); + + // Remplacement des mutexes des variables partagées. + reinitialisation_mutexes_variables_partagees(s_etat_processus); + + liberation_queue_signaux(s_etat_processus); + creation_queue_signaux(s_etat_processus); + if (lancement_thread_signaux(s_etat_processus) != d_absence_erreur) { (*s_etat_processus).erreur_systeme = d_es_processus; } - liberation_queue_signaux(s_etat_processus); - creation_queue_signaux(s_etat_processus); routine_recursive = 0; (*s_etat_processus).pointeur_signal_lecture = 0; @@ -1365,7 +1402,7 @@ instruction_detach(struct_processus *s_e (*s_argument_thread).pipe_nombre_elements_attente[1], &caractere, sizeof(caractere)) != sizeof(caractere)) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); (*s_etat_processus).erreur_systeme = d_es_processus; while((longueur_ecriture = write_atomic(s_etat_processus, @@ -1407,7 +1444,8 @@ instruction_detach(struct_processus *s_e pthread_mutex_init(&mutex_sections_critiques, &attributs_mutex); pthread_mutexattr_destroy(&attributs_mutex); - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; @@ -1476,6 +1514,30 @@ instruction_detach(struct_processus *s_e exit(EXIT_FAILURE); } + pthread_mutex_trylock(&((*s_etat_processus).mutex_signaux)); + + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_signaux)) + != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + + caractere = 0; + + while((longueur_ecriture = write_atomic(s_etat_processus, + (*s_argument_thread).pipe_nombre_elements_attente[1], + &caractere, sizeof(caractere))) != sizeof(caractere)) + { + if (longueur_ecriture == -1) + { + break; + } + } + + destruction_queue_signaux(s_etat_processus); + BUG(1, uprintf("Process management error line %d\n", __LINE__)); + exit(EXIT_FAILURE); + } + if ((*s_etat_processus).evaluation_expression_compilee == 'N') { free((*s_etat_processus).instruction_courante); @@ -1592,7 +1654,8 @@ instruction_detach(struct_processus *s_e * par liberation_threads(). */ - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { (*s_etat_processus).erreur_systeme = d_es; @@ -1661,7 +1724,8 @@ instruction_detach(struct_processus *s_e (*s_etat_processus).l_base_pile_processus = NULL; - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { (*s_etat_processus).erreur_systeme = d_es; @@ -2167,7 +2231,7 @@ instruction_detach(struct_processus *s_e 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; @@ -2330,7 +2394,8 @@ instruction_detach(struct_processus *s_e 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) { @@ -2384,7 +2449,8 @@ instruction_detach(struct_processus *s_e { destruction_queue_signaux(s_etat_processus); - 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); } @@ -2396,7 +2462,8 @@ instruction_detach(struct_processus *s_e { destruction_queue_signaux(s_etat_processus); - 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); } @@ -2411,19 +2478,20 @@ instruction_detach(struct_processus *s_e { destruction_queue_signaux(s_etat_processus); - 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)); scrutation_interruptions(s_etat_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; @@ -2743,12 +2811,12 @@ instruction_detach(struct_processus *s_e closelog(); - 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)); pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes)); pthread_mutex_destroy(&mutex_sections_critiques); @@ -2769,7 +2837,10 @@ instruction_detach(struct_processus *s_e destruction_queue_signaux(s_etat_processus); liberation_contexte_cas(s_etat_processus); arret_thread_signaux(s_etat_processus); - free(s_etat_processus); + liberation_allocateur(s_etat_processus); + liberation_allocateur_buffer(s_etat_processus); + pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer)); + sys_free(s_etat_processus); # ifdef DEBUG_MEMOIRE debug_memoire_verification(); @@ -2807,7 +2878,8 @@ instruction_detach(struct_processus *s_e (*(*l_element_courant).donnee).objet)).thread).pid == (*s_argument_thread).pid) { - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2816,7 +2888,8 @@ instruction_detach(struct_processus *s_e nanosleep(&attente, NULL); INCR_GRANULARITE(attente.tv_nsec); - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2836,14 +2909,14 @@ instruction_detach(struct_processus *s_e (struct_liste_chainee **) &((*s_etat_processus) .l_base_pile_processus), s_objet_systeme) == d_erreur) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); return; } if (empilement(s_etat_processus, &((*s_etat_processus).l_base_pile), s_objet) == d_erreur) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); return; } @@ -2870,11 +2943,11 @@ instruction_detach(struct_processus *s_e if (envoi_signal_processus((*s_argument_thread).pid, rpl_sigstart) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; - pthread_mutex_unlock(&((*s_etat_processus).mutex)); + pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)); return; } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return;