version 1.76, 2011/10/04 19:32:35
|
version 1.83, 2011/11/26 10:01:28
|
Line 1
|
Line 1
|
/* |
/* |
================================================================================ |
================================================================================ |
RPL/2 (R) version 4.1.4 |
RPL/2 (R) version 4.1.5 |
Copyright (C) 1989-2011 Dr. BERTRAND Joël |
Copyright (C) 1989-2011 Dr. BERTRAND Joël |
|
|
This file is part of RPL/2. |
This file is part of RPL/2. |
Line 817 instruction_detach(struct_processus *s_e
|
Line 817 instruction_detach(struct_processus *s_e
|
int pipe_initialisation_segment_signaux[2]; |
int pipe_initialisation_segment_signaux[2]; |
|
|
logical1 drapeau; |
logical1 drapeau; |
logical1 variable_partagee; |
|
|
|
pid_t ppid; |
pid_t ppid; |
pid_t pid_final; |
pid_t pid_final; |
Line 856 instruction_detach(struct_processus *s_e
|
Line 855 instruction_detach(struct_processus *s_e
|
|
|
unsigned long i; |
unsigned long i; |
|
|
|
volatile logical1 variable_partagee; |
|
|
(*s_etat_processus).erreur_execution = d_ex; |
(*s_etat_processus).erreur_execution = d_ex; |
|
|
attente.tv_sec = 0; |
attente.tv_sec = 0; |
Line 1954 instruction_detach(struct_processus *s_e
|
Line 1955 instruction_detach(struct_processus *s_e
|
|
|
if ((*s_etat_processus).erreur_systeme == d_es) |
if ((*s_etat_processus).erreur_systeme == d_es) |
{ |
{ |
|
// Évite le warning variable s_copie might be clobbered by |
|
// longjmp or vfork |
|
struct_objet **s; |
|
|
|
if ((s = malloc(sizeof(struct_objet *))) == NULL) |
|
{ |
|
(*s_etat_processus).erreur_execution = d_es_allocation_memoire; |
|
return; |
|
} |
|
|
|
(*s) = s_copie; |
|
|
if (setjmp(contexte_processus) == 0) |
if (setjmp(contexte_processus) == 0) |
{ |
{ |
if (variable_partagee == d_faux) |
if (variable_partagee == d_faux) |
Line 1987 instruction_detach(struct_processus *s_e
|
Line 2000 instruction_detach(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
if (evaluation(s_etat_processus, s_copie, 'E') == d_erreur) |
if (evaluation(s_etat_processus, (*s), 'E') == d_erreur) |
{ |
{ |
if (((*s_etat_processus).erreur_execution == d_ex) && |
if (((*s_etat_processus).erreur_execution == d_ex) && |
((*s_etat_processus).erreur_systeme == d_es)) |
((*s_etat_processus).erreur_systeme == d_es)) |
Line 1998 instruction_detach(struct_processus *s_e
|
Line 2011 instruction_detach(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
if ((*s_etat_processus).at_exit != NULL) |
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; |
(*s_etat_processus).var_volatile_requete_arret = 0; |
|
|
Line 2012 instruction_detach(struct_processus *s_e
|
Line 2027 instruction_detach(struct_processus *s_e
|
} |
} |
} |
} |
|
|
liberation(s_etat_processus, s_copie); |
liberation(s_etat_processus, (*s)); |
} |
} |
} |
} |
|
|
|
free(s); |
} |
} |
|
|
liberation(s_etat_processus, (*s_etat_processus).at_exit); |
liberation(s_etat_processus, (*s_etat_processus).at_exit); |