version 1.17, 2010/05/22 21:45:50
|
version 1.20, 2010/06/04 07:48:20
|
Line 1
|
Line 1
|
/* |
/* |
================================================================================ |
================================================================================ |
RPL/2 (R) version 4.0.15 |
RPL/2 (R) version 4.0.16 |
Copyright (C) 1989-2010 Dr. BERTRAND Joël |
Copyright (C) 1989-2010 Dr. BERTRAND Joël |
|
|
This file is part of RPL/2. |
This file is part of RPL/2. |
Line 184 insertion_thread_surveillance(struct_pro
|
Line 184 insertion_thread_surveillance(struct_pro
|
} |
} |
} |
} |
|
|
|
printf("<1> +1 %d\n", (*s_argument_thread).nombre_references); |
(*l_nouvel_objet).suivant = liste_threads_surveillance; |
(*l_nouvel_objet).suivant = liste_threads_surveillance; |
(*l_nouvel_objet).donnee = (void *) s_argument_thread; |
(*l_nouvel_objet).donnee = (void *) s_argument_thread; |
|
|
Line 390 retrait_thread_surveillance(struct_proce
|
Line 391 retrait_thread_surveillance(struct_proce
|
} |
} |
|
|
(*s_argument_thread).nombre_references--; |
(*s_argument_thread).nombre_references--; |
|
printf("<3> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread); |
|
|
BUG((*s_argument_thread).nombre_references < 0, |
BUG((*s_argument_thread).nombre_references < 0, |
printf("(*s_argument_thread).nombre_references = %d\n", |
printf("(*s_argument_thread).nombre_references = %d\n", |
(int) (*s_argument_thread).nombre_references)); |
(int) (*s_argument_thread).nombre_references)); |
|
|
|
printf("retrait_thread_surveillance : %d\n", (*s_argument_thread).nombre_references); |
if ((*s_argument_thread).nombre_references == 0) |
if ((*s_argument_thread).nombre_references == 0) |
{ |
{ |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
Line 448 retrait_thread_surveillance(struct_proce
|
Line 451 retrait_thread_surveillance(struct_proce
|
|
|
pthread_sigmask(SIG_SETMASK, &oldset, NULL); |
pthread_sigmask(SIG_SETMASK, &oldset, NULL); |
sigpending(&set); |
sigpending(&set); |
|
|
return; |
return; |
} |
} |
|
|
Line 669 liberation_threads(struct_processus *s_e
|
Line 673 liberation_threads(struct_processus *s_e
|
.l_base_pile_processus; |
.l_base_pile_processus; |
while(element_courant != NULL) |
while(element_courant != NULL) |
{ |
{ |
pthread_mutex_trylock(&((*(*((struct_liste_chainee *) |
s_argument_thread = (struct_descripteur_thread *) |
element_courant)).donnee).mutex)); |
(*((struct_liste_chainee *) element_courant)).donnee; |
pthread_mutex_unlock(&((*(*((struct_liste_chainee *) |
|
element_courant)).donnee).mutex)); |
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
liberation(s_etat_processus, |
{ |
(*((struct_liste_chainee *) element_courant)).donnee); |
(*s_etat_processus).erreur_systeme = d_es_processus; |
|
sem_post(&semaphore_liste_threads); |
|
return; |
|
} |
|
|
|
(*s_argument_thread).nombre_references--; |
|
printf("<1> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread); |
|
|
|
BUG((*s_argument_thread).nombre_references < 0, |
|
printf("(*s_argument_thread).nombre_references = %d\n", |
|
(int) (*s_argument_thread).nombre_references)); |
|
|
|
if ((*s_argument_thread).nombre_references == 0) |
|
{ |
|
close((*s_argument_thread).pipe_objets[0]); |
|
close((*s_argument_thread).pipe_acquittement[1]); |
|
close((*s_argument_thread).pipe_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_objets_attente[0]); |
|
close((*s_argument_thread).pipe_interruptions[0]); |
|
close((*s_argument_thread) |
|
.pipe_nombre_interruptions_attente[0]); |
|
|
|
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) |
|
!= 0) |
|
{ |
|
(*s_etat_processus).erreur_systeme = d_es_processus; |
|
sem_post(&semaphore_liste_threads); |
|
return; |
|
} |
|
|
|
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
|
|
|
if ((*s_argument_thread).processus_detache == d_faux) |
|
{ |
|
if ((*s_argument_thread).destruction_objet == d_vrai) |
|
{ |
|
liberation(s_etat_processus, (*s_argument_thread) |
|
.argument); |
|
} |
|
} |
|
|
|
free(s_argument_thread); |
|
} |
|
else |
|
{ |
|
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) |
|
!= 0) |
|
{ |
|
(*s_etat_processus).erreur_systeme = d_es_processus; |
|
sem_post(&semaphore_liste_threads); |
|
return; |
|
} |
|
} |
|
|
element_suivant = (*((struct_liste_chainee *) element_courant)) |
element_suivant = (*((struct_liste_chainee *) element_courant)) |
.suivant; |
.suivant; |
free((struct_liste_chainee *) element_courant); |
free(element_courant); |
element_courant = element_suivant; |
element_courant = element_suivant; |
} |
} |
|
|
|
(*s_etat_processus).l_base_pile_processus = NULL; |
|
|
pthread_mutex_trylock(&((*(*s_etat_processus).indep).mutex)); |
pthread_mutex_trylock(&((*(*s_etat_processus).indep).mutex)); |
pthread_mutex_unlock(&((*(*s_etat_processus).indep).mutex)); |
pthread_mutex_unlock(&((*(*s_etat_processus).indep).mutex)); |
liberation(s_etat_processus, (*s_etat_processus).indep); |
liberation(s_etat_processus, (*s_etat_processus).indep); |
Line 1291 liberation_threads(struct_processus *s_e
|
Line 1351 liberation_threads(struct_processus *s_e
|
s_argument_thread = (struct_descripteur_thread *) |
s_argument_thread = (struct_descripteur_thread *) |
(*l_element_courant).donnee; |
(*l_element_courant).donnee; |
|
|
close((*s_argument_thread).pipe_objets[0]); |
|
close((*s_argument_thread).pipe_acquittement[1]); |
|
close((*s_argument_thread).pipe_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_objets_attente[0]); |
|
close((*s_argument_thread).pipe_interruptions[0]); |
|
close((*s_argument_thread).pipe_nombre_interruptions_attente[0]); |
|
|
|
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
Line 1307 liberation_threads(struct_processus *s_e
|
Line 1359 liberation_threads(struct_processus *s_e
|
} |
} |
|
|
(*s_argument_thread).nombre_references--; |
(*s_argument_thread).nombre_references--; |
|
printf("<2> -1 %d %p\n", (*s_argument_thread).nombre_references, s_argument_thread); |
|
|
BUG((*s_argument_thread).nombre_references < 0, |
BUG((*s_argument_thread).nombre_references < 0, |
printf("(*s_argument_thread).nombre_references = %d\n", |
printf("(*s_argument_thread).nombre_references = %d\n", |
Line 1314 liberation_threads(struct_processus *s_e
|
Line 1367 liberation_threads(struct_processus *s_e
|
|
|
if ((*s_argument_thread).nombre_references == 0) |
if ((*s_argument_thread).nombre_references == 0) |
{ |
{ |
|
close((*s_argument_thread).pipe_objets[0]); |
|
close((*s_argument_thread).pipe_acquittement[1]); |
|
close((*s_argument_thread).pipe_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_injections[1]); |
|
close((*s_argument_thread).pipe_nombre_objets_attente[0]); |
|
close((*s_argument_thread).pipe_interruptions[0]); |
|
close((*s_argument_thread).pipe_nombre_interruptions_attente[0]); |
|
|
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
Line 1322 liberation_threads(struct_processus *s_e
|
Line 1383 liberation_threads(struct_processus *s_e
|
} |
} |
|
|
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
|
|
|
if ((*s_argument_thread).processus_detache == d_faux) |
|
{ |
|
if ((*s_argument_thread).destruction_objet == d_vrai) |
|
{ |
|
liberation(s_etat_processus, (*s_argument_thread).argument); |
|
} |
|
} |
|
|
free(s_argument_thread); |
free(s_argument_thread); |
} |
} |
else |
else |