--- rpl/src/gestion_threads.c 2011/09/14 14:34:28 1.50 +++ rpl/src/gestion_threads.c 2011/09/14 17:55:59 1.51 @@ -73,52 +73,9 @@ lancement_thread(void *argument) s_argument_thread = (struct_descripteur_thread *) argument; s_etat_processus = (*s_argument_thread).s_nouvel_etat_processus; - (*s_etat_processus).tid_courant = pthread_self(); (*s_argument_thread).tid = pthread_self(); (*s_argument_thread).thread_actif = d_vrai; -# ifndef SEMAPHORES_NOMMES - if (pthread_setspecific(semaphore_fork_processus_courant, - &((*s_etat_processus).semaphore_fork)) != 0) -# else - if (pthread_setspecific(semaphore_fork_processus_courant, - (*s_etat_processus).semaphore_fork) != 0) -# endif - { - (*s_etat_processus).erreur_systeme = d_es_processus; - - pthread_mutex_unlock(&((*s_etat_processus).mutex)); - - 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)) - { - if (longueur_ecriture == -1) - { - break; - } - } - - 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); - } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; @@ -1061,8 +1018,7 @@ lancement_thread(void *argument) retrait_thread(s_etat_processus); pthread_mutex_destroy(&((*s_etat_processus).mutex)); pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); - - sem_destroy(&((*s_etat_processus).semaphore_fork)); + pthread_mutex_destroy(&((*s_etat_processus).mutex_fork)); liberation_contexte_cas(s_etat_processus); free((*s_etat_processus).localisation);