version 1.14, 2010/04/28 07:05:38
|
version 1.17, 2010/04/29 07:30:57
|
Line 1062 instruction_detach(struct_processus *s_e
|
Line 1062 instruction_detach(struct_processus *s_e
|
return; |
return; |
} |
} |
|
|
|
if (sigaddset(&set, SIGFABORT) != 0) |
|
{ |
|
(*s_etat_processus).erreur_systeme = d_es_processus; |
|
return; |
|
} |
|
|
if (sigaddset(&set, SIGURG) != 0) |
if (sigaddset(&set, SIGURG) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
Line 1862 instruction_detach(struct_processus *s_e
|
Line 1868 instruction_detach(struct_processus *s_e
|
d_ex_erreur_evaluation; |
d_ex_erreur_evaluation; |
} |
} |
} |
} |
|
else |
|
{ |
|
if (((*s_etat_processus).var_volatile_alarme == 0) |
|
&& ((*s_etat_processus).arret_depuis_abort == 0) |
|
&& ((*s_etat_processus).at_exit != NULL)) |
|
{ |
|
(*s_etat_processus).var_volatile_requete_arret = 0; |
|
|
|
if (evaluation(s_etat_processus, |
|
(*s_etat_processus).at_exit, 'E') == d_erreur) |
|
{ |
|
(*s_etat_processus).erreur_execution = |
|
d_ex_erreur_evaluation; |
|
} |
|
} |
|
} |
} |
} |
else |
else |
{ |
{ |
Line 1878 instruction_detach(struct_processus *s_e
|
Line 1900 instruction_detach(struct_processus *s_e
|
{ |
{ |
if ((*s_etat_processus).at_exit != NULL) |
if ((*s_etat_processus).at_exit != NULL) |
{ |
{ |
|
(*s_etat_processus).var_volatile_requete_arret = 0; |
|
|
if (evaluation(s_etat_processus, |
if (evaluation(s_etat_processus, |
(*s_etat_processus).at_exit, 'E') == d_erreur) |
(*s_etat_processus).at_exit, 'E') == d_erreur) |
{ |
{ |
Line 1888 instruction_detach(struct_processus *s_e
|
Line 1912 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
liberation(s_etat_processus, s_copie); |
liberation(s_etat_processus, s_copie); |
liberation(s_etat_processus, (*s_etat_processus).at_exit); |
|
} |
} |
} |
} |
|
|
|
liberation(s_etat_processus, (*s_etat_processus).at_exit); |
|
|
l_element_courant = (*s_etat_processus).liste_mutexes; |
l_element_courant = (*s_etat_processus).liste_mutexes; |
while(l_element_courant != NULL) |
while(l_element_courant != NULL) |
{ |
{ |
Line 2118 instruction_detach(struct_processus *s_e
|
Line 2143 instruction_detach(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
kill((*(*((struct_processus_fils *) |
if ((*s_etat_processus).arret_depuis_abort == -1) |
(*(*l_element_courant).donnee).objet)).thread).pid, |
{ |
SIGFSTOP); |
kill((*(*((struct_processus_fils *) |
|
(*(*l_element_courant).donnee).objet)).thread) |
|
.pid, SIGFABORT); |
|
} |
|
else |
|
{ |
|
kill((*(*((struct_processus_fils *) |
|
(*(*l_element_courant).donnee).objet)).thread) |
|
.pid, SIGFSTOP); |
|
} |
} |
} |
} |
} |
else |
else |
Line 2167 instruction_detach(struct_processus *s_e
|
Line 2201 instruction_detach(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
pthread_kill((*(*((struct_processus_fils *) |
if ((*s_etat_processus).arret_depuis_abort == -1) |
(*(*l_element_courant).donnee).objet)).thread) |
{ |
.tid, SIGFSTOP); |
pthread_kill((*(*((struct_processus_fils *) |
|
(*(*l_element_courant).donnee).objet)) |
|
.thread).tid, SIGFABORT); |
|
} |
|
else |
|
{ |
|
pthread_kill((*(*((struct_processus_fils *) |
|
(*(*l_element_courant).donnee).objet)) |
|
.thread).tid, SIGFSTOP); |
|
} |
} |
} |
} |
} |
|
|
Line 2197 instruction_detach(struct_processus *s_e
|
Line 2240 instruction_detach(struct_processus *s_e
|
l_element_courant = (struct_liste_chainee *) |
l_element_courant = (struct_liste_chainee *) |
(*s_etat_processus).l_base_pile_processus; |
(*s_etat_processus).l_base_pile_processus; |
|
|
if ((*s_etat_processus).nombre_interruptions_non_affectees != 0) |
|
{ |
|
affectation_interruptions_logicielles(s_etat_processus); |
|
} |
|
|
|
registre_stop = (*s_etat_processus) |
registre_stop = (*s_etat_processus) |
.var_volatile_traitement_retarde_stop; |
.var_volatile_traitement_retarde_stop; |
(*s_etat_processus).var_volatile_traitement_retarde_stop = 1; |
(*s_etat_processus).var_volatile_traitement_retarde_stop = 1; |
Line 2284 instruction_detach(struct_processus *s_e
|
Line 2322 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
pthread_mutex_unlock(&((*s_etat_processus).mutex)); |
pthread_mutex_unlock(&((*s_etat_processus).mutex)); |
|
|
|
if ((*s_etat_processus).nombre_interruptions_non_affectees != 0) |
|
{ |
|
affectation_interruptions_logicielles(s_etat_processus); |
|
} |
|
|
nanosleep(&attente, NULL); |
nanosleep(&attente, NULL); |
pthread_mutex_lock(&((*s_etat_processus).mutex)); |
pthread_mutex_lock(&((*s_etat_processus).mutex)); |
} |
} |