--- rpl/src/gestion_threads.c 2011/09/14 17:55:59 1.51 +++ rpl/src/gestion_threads.c 2012/05/18 14:09:41 1.62 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.3 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.8 + Copyright (C) 1989-2012 Dr. BERTRAND Joël This file is part of RPL/2. @@ -73,42 +73,20 @@ lancement_thread(void *argument) s_argument_thread = (struct_descripteur_thread *) argument; s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus; - (*s_argument_thread).tid = pthread_self(); - (*s_argument_thread).thread_actif = d_vrai; - - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) - { - (*s_etat_processus).erreur_systeme = d_es_processus; - - pthread_mutex_lock(&((*s_argument_thread).mutex)); - pthread_mutex_unlock(&((*s_argument_thread).mutex)); - - (*s_argument_thread).thread_actif = d_faux; - - tid_final = -2; - while((longueur_ecriture = write_atomic(s_etat_processus, - (*s_argument_thread).pipe_nombre_interruptions_attente[1], - &tid_final, sizeof(tid_final))) != sizeof(tid_final)) +# ifndef SEMAPHORES_NOMMES + sem_init(&((*s_etat_processus).semaphore_fork), 0, 0); +# else + if (((*s_etat_processus).semaphore_fork = sem_init3(0, getpid(), + pthread_self(), SEM_FORK)) == SEM_FAILED) { - if (longueur_ecriture == -1) - { - break; - } + (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; + return(NULL); } +# endif - while((longueur_ecriture = write_atomic(s_etat_processus, - (*s_argument_thread).pipe_nombre_objets_attente[1], - &tid_final, sizeof(tid_final))) != sizeof(tid_final)) - { - if (longueur_ecriture == -1) - { - break; - } - } - - pthread_exit(NULL); - } + (*s_argument_thread).tid = pthread_self(); + (*s_argument_thread).thread_actif = d_vrai; insertion_thread(s_etat_processus, d_faux); @@ -119,7 +97,6 @@ lancement_thread(void *argument) (*s_argument_thread).pipe_nombre_objets_attente[1], "-", sizeof(unsigned char)) != sizeof(unsigned char)) { - pthread_mutex_unlock(&((*s_etat_processus).mutex)); (*s_etat_processus).erreur_systeme = d_es_processus; pthread_mutex_lock(&((*s_argument_thread).mutex)); @@ -1018,7 +995,13 @@ lancement_thread(void *argument) retrait_thread(s_etat_processus); pthread_mutex_destroy(&((*s_etat_processus).mutex)); pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); - pthread_mutex_destroy(&((*s_etat_processus).mutex_fork)); + +# ifndef SEMAPHORES_NOMMES + sem_destroy(&((*s_etat_processus).semaphore_fork)); +# else + sem_destroy3((*s_etat_processus).semaphore_fork, getpid(), + pthread_self(), SEM_FORK); +# endif liberation_contexte_cas(s_etat_processus); free((*s_etat_processus).localisation);