version 1.153, 2016/08/26 08:57:56
|
version 1.158, 2017/08/02 14:41:35
|
Line 1
|
Line 1
|
/* |
/* |
================================================================================ |
================================================================================ |
RPL/2 (R) version 4.1.25 |
RPL/2 (R) version 4.1.27 |
Copyright (C) 1989-2016 Dr. BERTRAND Joël |
Copyright (C) 1989-2017 Dr. BERTRAND Joël |
|
|
This file is part of RPL/2. |
This file is part of RPL/2. |
|
|
Line 815 instruction_der(struct_processus *s_etat
|
Line 815 instruction_der(struct_processus *s_etat
|
void |
void |
instruction_detach(struct_processus *s_etat_processus) |
instruction_detach(struct_processus *s_etat_processus) |
{ |
{ |
|
#ifndef EXPERIMENTAL_CODE |
|
printf("DETACH currently broken is replaced by SPAWN...\n"); |
|
instruction_spawn(s_etat_processus); |
|
#else |
int pipe_initialisation_segment_signaux[2]; |
int pipe_initialisation_segment_signaux[2]; |
|
|
logical1 drapeau; |
logical1 drapeau; |
Line 1088 instruction_detach(struct_processus *s_e
|
Line 1092 instruction_detach(struct_processus *s_e
|
return; |
return; |
} |
} |
|
|
|
verrouillage_threads_concurrents(s_etat_processus); |
|
|
if (pthread_mutex_lock(&mutex_liste_variables_partagees) != 0) |
if (pthread_mutex_lock(&mutex_liste_variables_partagees) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
return; |
return; |
} |
} |
|
|
verrouillage_threads_concurrents(s_etat_processus); |
|
|
|
if (pthread_mutex_lock(&((*s_etat_processus).mutex_allocation_buffer)) != 0) |
if (pthread_mutex_lock(&((*s_etat_processus).mutex_allocation_buffer)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
Line 1318 instruction_detach(struct_processus *s_e
|
Line 1322 instruction_detach(struct_processus *s_e
|
&attributs_mutex); |
&attributs_mutex); |
pthread_mutexattr_destroy(&attributs_mutex); |
pthread_mutexattr_destroy(&attributs_mutex); |
|
|
#if 0 |
|
liberation_queue_signaux(s_etat_processus); |
liberation_queue_signaux(s_etat_processus); |
#endif |
|
creation_queue_signaux(s_etat_processus); |
creation_queue_signaux(s_etat_processus); |
|
|
routine_recursive = 0; |
routine_recursive = 0; |
Line 1336 instruction_detach(struct_processus *s_e
|
Line 1338 instruction_detach(struct_processus *s_e
|
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
} |
} |
|
|
#if 0 |
|
close(pipe_initialisation_segment_signaux[0]); |
close(pipe_initialisation_segment_signaux[0]); |
close(pipe_initialisation_segment_signaux[1]); |
close(pipe_initialisation_segment_signaux[1]); |
|
|
Line 1413 instruction_detach(struct_processus *s_e
|
Line 1414 instruction_detach(struct_processus *s_e
|
free(l_element_courant); |
free(l_element_courant); |
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
#endif |
|
|
|
(*s_etat_processus).liste_mutexes = NULL; |
(*s_etat_processus).liste_mutexes = NULL; |
|
|
#if 0 |
|
liberation_threads(s_etat_processus); |
liberation_threads(s_etat_processus); |
#endif |
|
insertion_thread(s_etat_processus, d_vrai); |
insertion_thread(s_etat_processus, d_vrai); |
|
|
// Envoi d'une donnée pour signaler le démarrage du processus au thread |
// Envoi d'une donnée pour signaler le démarrage du processus au thread |
Line 1449 instruction_detach(struct_processus *s_e
|
Line 1447 instruction_detach(struct_processus *s_e
|
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
|
|
#if 0 |
|
if (pthread_mutex_destroy(&mutex_sections_critiques) != 0) |
if (pthread_mutex_destroy(&mutex_sections_critiques) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
Line 1468 instruction_detach(struct_processus *s_e
|
Line 1465 instruction_detach(struct_processus *s_e
|
BUG(1, uprintf("Process management error line %d\n", __LINE__)); |
BUG(1, uprintf("Process management error line %d\n", __LINE__)); |
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
#endif |
|
|
|
pthread_mutexattr_init(&attributs_mutex); |
pthread_mutexattr_init(&attributs_mutex); |
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE); |
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_RECURSIVE); |
Line 1571 instruction_detach(struct_processus *s_e
|
Line 1567 instruction_detach(struct_processus *s_e
|
|
|
if ((*s_etat_processus).evaluation_expression_compilee == 'N') |
if ((*s_etat_processus).evaluation_expression_compilee == 'N') |
{ |
{ |
#if 0 |
|
free((*s_etat_processus).instruction_courante); |
free((*s_etat_processus).instruction_courante); |
#endif |
|
(*s_etat_processus).instruction_courante = NULL; |
(*s_etat_processus).instruction_courante = NULL; |
} |
} |
|
|
#if 0 |
|
(*s_etat_processus).var_volatile_processus_pere = 0; |
(*s_etat_processus).var_volatile_processus_pere = 0; |
(*s_etat_processus).var_volatile_processus_racine = 0; |
(*s_etat_processus).var_volatile_processus_racine = 0; |
|
|
Line 1594 instruction_detach(struct_processus *s_e
|
Line 1587 instruction_detach(struct_processus *s_e
|
liberation(s_etat_processus, (*s_etat_processus).at_poke); |
liberation(s_etat_processus, (*s_etat_processus).at_poke); |
(*s_etat_processus).at_poke = NULL; |
(*s_etat_processus).at_poke = NULL; |
(*s_etat_processus).traitement_at_poke = 'N'; |
(*s_etat_processus).traitement_at_poke = 'N'; |
#endif |
|
|
|
for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++) |
for(i = 0; i < d_NOMBRE_INTERRUPTIONS; i++) |
{ |
{ |
#if 0 |
|
liberation(s_etat_processus, |
liberation(s_etat_processus, |
(*s_etat_processus).corps_interruptions[i]); |
(*s_etat_processus).corps_interruptions[i]); |
#endif |
|
|
|
(*s_etat_processus).corps_interruptions[i] = NULL; |
(*s_etat_processus).corps_interruptions[i] = NULL; |
(*s_etat_processus).masque_interruptions[i] = 'N'; |
(*s_etat_processus).masque_interruptions[i] = 'N'; |
(*s_etat_processus).queue_interruptions[i] = 0; |
(*s_etat_processus).queue_interruptions[i] = 0; |
|
|
#if 0 |
|
l_element_courant = (*s_etat_processus) |
l_element_courant = (*s_etat_processus) |
.pile_origine_interruptions[i]; |
.pile_origine_interruptions[i]; |
|
|
Line 1618 instruction_detach(struct_processus *s_e
|
Line 1607 instruction_detach(struct_processus *s_e
|
free(l_element_courant); |
free(l_element_courant); |
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
#endif |
|
|
|
(*s_etat_processus).pile_origine_interruptions[i] = NULL; |
(*s_etat_processus).pile_origine_interruptions[i] = NULL; |
} |
} |
Line 1640 instruction_detach(struct_processus *s_e
|
Line 1628 instruction_detach(struct_processus *s_e
|
scrutation_interruptions(s_etat_processus); |
scrutation_interruptions(s_etat_processus); |
} |
} |
|
|
#if 0 |
|
(*s_etat_processus).niveau_initial = (*s_etat_processus).niveau_courant; |
(*s_etat_processus).niveau_initial = (*s_etat_processus).niveau_courant; |
(*s_etat_processus).presence_pipes = d_vrai; |
(*s_etat_processus).presence_pipes = d_vrai; |
(*s_etat_processus).debug_programme = d_faux; |
(*s_etat_processus).debug_programme = d_faux; |
Line 1663 instruction_detach(struct_processus *s_e
|
Line 1650 instruction_detach(struct_processus *s_e
|
(*s_etat_processus).pid_erreur_processus_fils = getpid(); |
(*s_etat_processus).pid_erreur_processus_fils = getpid(); |
(*s_etat_processus).sections_critiques = 0; |
(*s_etat_processus).sections_critiques = 0; |
(*s_etat_processus).initialisation_scheduler = d_faux; |
(*s_etat_processus).initialisation_scheduler = d_faux; |
#endif |
|
|
|
#if 0 |
|
if ((*s_etat_processus).profilage == d_vrai) |
if ((*s_etat_processus).profilage == d_vrai) |
{ |
{ |
liberation_profil(s_etat_processus); |
liberation_profil(s_etat_processus); |
} |
} |
#endif |
|
|
|
(*s_etat_processus).pile_profilage = NULL; |
(*s_etat_processus).pile_profilage = NULL; |
|
|
#if 0 |
|
if ((*s_etat_processus).generateur_aleatoire != NULL) |
if ((*s_etat_processus).generateur_aleatoire != NULL) |
{ |
{ |
liberation_generateur_aleatoire(s_etat_processus); |
liberation_generateur_aleatoire(s_etat_processus); |
} |
} |
#endif |
|
|
|
(*s_etat_processus).generateur_aleatoire = NULL; |
(*s_etat_processus).generateur_aleatoire = NULL; |
|
|
Line 1732 instruction_detach(struct_processus *s_e
|
Line 1714 instruction_detach(struct_processus *s_e
|
printf("(*s_argument_thread2).nombre_references = %d\n", |
printf("(*s_argument_thread2).nombre_references = %d\n", |
(int) (*s_argument_thread2).nombre_references)); |
(int) (*s_argument_thread2).nombre_references)); |
|
|
#if 0 |
|
if ((*s_argument_thread2).nombre_references == 0) |
if ((*s_argument_thread2).nombre_references == 0) |
{ |
{ |
close((*s_argument_thread2).pipe_objets[0]); |
close((*s_argument_thread2).pipe_objets[0]); |
Line 1757 instruction_detach(struct_processus *s_e
|
Line 1738 instruction_detach(struct_processus *s_e
|
free((*(*l_element_courant).donnee).objet); |
free((*(*l_element_courant).donnee).objet); |
free((*l_element_courant).donnee); |
free((*l_element_courant).donnee); |
} |
} |
#endif |
|
|
|
l_element_suivant = (*l_element_courant).suivant; |
l_element_suivant = (*l_element_courant).suivant; |
free((struct_liste_chainee *) l_element_courant); |
free((struct_liste_chainee *) l_element_courant); |
Line 1792 instruction_detach(struct_processus *s_e
|
Line 1772 instruction_detach(struct_processus *s_e
|
* Initialisation de la pile système |
* Initialisation de la pile système |
*/ |
*/ |
|
|
#if 0 |
|
l_element_courant = (struct_liste_chainee *) |
l_element_courant = (struct_liste_chainee *) |
(*s_etat_processus).l_base_pile_systeme; |
(*s_etat_processus).l_base_pile_systeme; |
while(l_element_courant != NULL) |
while(l_element_courant != NULL) |
Line 1819 instruction_detach(struct_processus *s_e
|
Line 1798 instruction_detach(struct_processus *s_e
|
|
|
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
#endif |
|
|
|
(*s_etat_processus).l_base_pile_systeme = NULL; |
(*s_etat_processus).l_base_pile_systeme = NULL; |
(*s_etat_processus).hauteur_pile_systeme = 0; |
(*s_etat_processus).hauteur_pile_systeme = 0; |
|
|
#if 0 |
|
empilement_pile_systeme(s_etat_processus); |
empilement_pile_systeme(s_etat_processus); |
|
|
if ((*s_etat_processus).erreur_systeme != d_es) |
if ((*s_etat_processus).erreur_systeme != d_es) |
Line 1847 instruction_detach(struct_processus *s_e
|
Line 1824 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
(*(*s_etat_processus).l_base_pile_systeme).retour_definition = 'Y'; |
(*(*s_etat_processus).l_base_pile_systeme).retour_definition = 'Y'; |
#endif |
|
|
|
#if 0 |
|
l_element_courant = (struct_liste_chainee *) |
l_element_courant = (struct_liste_chainee *) |
(*s_etat_processus).s_marques; |
(*s_etat_processus).s_marques; |
|
|
Line 1862 instruction_detach(struct_processus *s_e
|
Line 1837 instruction_detach(struct_processus *s_e
|
free((struct_marque *) l_element_courant); |
free((struct_marque *) l_element_courant); |
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
#endif |
|
|
|
(*s_etat_processus).s_marques = NULL; |
(*s_etat_processus).s_marques = NULL; |
|
|
Line 1871 instruction_detach(struct_processus *s_e
|
Line 1845 instruction_detach(struct_processus *s_e
|
* les variables dans le cas d'un programme compilé. |
* les variables dans le cas d'un programme compilé. |
*/ |
*/ |
|
|
#if 0 |
|
empilement_pile_systeme(s_etat_processus); |
empilement_pile_systeme(s_etat_processus); |
|
|
if ((*s_etat_processus).erreur_systeme != d_es) |
if ((*s_etat_processus).erreur_systeme != d_es) |
Line 1894 instruction_detach(struct_processus *s_e
|
Line 1867 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
(*(*s_etat_processus).l_base_pile_systeme).retour_definition = 'Y'; |
(*(*s_etat_processus).l_base_pile_systeme).retour_definition = 'Y'; |
#endif |
|
|
|
/* |
/* |
* Destruction des sorties graphiques et PostScript |
* Destruction des sorties graphiques et PostScript |
*/ |
*/ |
|
|
#if 0 |
|
while((*s_etat_processus).fichiers_graphiques != NULL) |
while((*s_etat_processus).fichiers_graphiques != NULL) |
{ |
{ |
free((*(*s_etat_processus).fichiers_graphiques).nom); |
free((*(*s_etat_processus).fichiers_graphiques).nom); |
Line 1922 instruction_detach(struct_processus *s_e
|
Line 1893 instruction_detach(struct_processus *s_e
|
pclose((*s_etat_processus).entree_standard); |
pclose((*s_etat_processus).entree_standard); |
(*s_etat_processus).entree_standard = NULL; |
(*s_etat_processus).entree_standard = NULL; |
} |
} |
#endif |
|
|
|
(*s_etat_processus).requete_nouveau_plan = d_vrai; |
(*s_etat_processus).requete_nouveau_plan = d_vrai; |
(*s_etat_processus).mise_a_jour_trace_requise = d_faux; |
(*s_etat_processus).mise_a_jour_trace_requise = d_faux; |
Line 1937 instruction_detach(struct_processus *s_e
|
Line 1907 instruction_detach(struct_processus *s_e
|
* Destruction des piles de fichiers |
* Destruction des piles de fichiers |
*/ |
*/ |
|
|
#if 0 |
|
l_element_courant = (*s_etat_processus).s_fichiers; |
l_element_courant = (*s_etat_processus).s_fichiers; |
|
|
while(l_element_courant != NULL) |
while(l_element_courant != NULL) |
Line 1992 instruction_detach(struct_processus *s_e
|
Line 1961 instruction_detach(struct_processus *s_e
|
*/ |
*/ |
|
|
(*s_etat_processus).s_connecteurs_sql = NULL; |
(*s_etat_processus).s_connecteurs_sql = NULL; |
#endif |
|
|
|
if ((*s_etat_processus).debug == d_vrai) |
if ((*s_etat_processus).debug == d_vrai) |
{ |
{ |
Line 2010 instruction_detach(struct_processus *s_e
|
Line 1978 instruction_detach(struct_processus *s_e
|
} |
} |
} |
} |
|
|
#if 0 |
|
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 |
// Évite le warning variable s_copie might be clobbered by |
Line 2115 instruction_detach(struct_processus *s_e
|
Line 2082 instruction_detach(struct_processus *s_e
|
|
|
free(s); |
free(s); |
} |
} |
#endif |
|
|
|
#if 0 |
|
for(i = 0; i < (*s_etat_processus).sections_critiques; i++) |
for(i = 0; i < (*s_etat_processus).sections_critiques; i++) |
{ |
{ |
pthread_mutex_unlock(&mutex_sections_critiques); |
pthread_mutex_unlock(&mutex_sections_critiques); |
Line 2139 instruction_detach(struct_processus *s_e
|
Line 2104 instruction_detach(struct_processus *s_e
|
{ |
{ |
pthread_cancel((*s_etat_processus).thread_fusible); |
pthread_cancel((*s_etat_processus).thread_fusible); |
} |
} |
#endif |
|
|
|
caractere = 0; |
caractere = 0; |
|
|
Line 2244 instruction_detach(struct_processus *s_e
|
Line 2208 instruction_detach(struct_processus *s_e
|
} |
} |
} |
} |
|
|
#if 0 |
|
l_element_courant = (*s_etat_processus).s_fichiers; |
l_element_courant = (*s_etat_processus).s_fichiers; |
|
|
while(l_element_courant != NULL) |
while(l_element_courant != NULL) |
Line 2858 instruction_detach(struct_processus *s_e
|
Line 2821 instruction_detach(struct_processus *s_e
|
liberation_profil(s_etat_processus); |
liberation_profil(s_etat_processus); |
} |
} |
|
|
#endif |
|
attente.tv_sec = 0; |
attente.tv_sec = 0; |
attente.tv_nsec = GRANULARITE_us * 1000; |
attente.tv_nsec = GRANULARITE_us * 1000; |
|
|
Line 2868 instruction_detach(struct_processus *s_e
|
Line 2830 instruction_detach(struct_processus *s_e
|
INCR_GRANULARITE(attente.tv_nsec); |
INCR_GRANULARITE(attente.tv_nsec); |
} |
} |
|
|
#if 0 |
|
closelog(); |
closelog(); |
|
|
retrait_thread(s_etat_processus); |
retrait_thread(s_etat_processus); |
liberation_contexte_cas(s_etat_processus); |
liberation_contexte_cas(s_etat_processus); |
#endif |
|
destruction_queue_signaux(s_etat_processus); |
destruction_queue_signaux(s_etat_processus); |
|
|
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
Line 2885 instruction_detach(struct_processus *s_e
|
Line 2845 instruction_detach(struct_processus *s_e
|
pthread_self(), SEM_FORK); |
pthread_self(), SEM_FORK); |
# endif |
# endif |
|
|
#if 0 |
|
clear_history(); |
clear_history(); |
|
|
close((*s_argument_thread).pipe_erreurs[1]); |
close((*s_argument_thread).pipe_erreurs[1]); |
Line 2919 instruction_detach(struct_processus *s_e
|
Line 2878 instruction_detach(struct_processus *s_e
|
debug_memoire_verification(); |
debug_memoire_verification(); |
analyse_post_mortem(); |
analyse_post_mortem(); |
# endif |
# endif |
#endif |
|
|
|
exit(EXIT_SUCCESS); |
exit(EXIT_SUCCESS); |
} |
} |
Line 3029 instruction_detach(struct_processus *s_e
|
Line 2987 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
return; |
return; |
|
#endif |
} |
} |
|
|
// vim: ts=4 |
// vim: ts=4 |