version 1.150, 2016/03/29 12:28:02
|
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 1288 instruction_detach(struct_processus *s_e
|
Line 1292 instruction_detach(struct_processus *s_e
|
* Processus fils |
* Processus fils |
*/ |
*/ |
|
|
|
// EPERM |
|
#if 0 |
pthread_mutex_destroy(&mutex_liste_variables_partagees); |
pthread_mutex_destroy(&mutex_liste_variables_partagees); |
pthread_mutex_destroy(&mutex_liste_threads); |
pthread_mutex_destroy(&mutex_liste_threads); |
|
pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus); |
|
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); |
|
#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 1301 instruction_detach(struct_processus *s_e
|
Line 1310 instruction_detach(struct_processus *s_e
|
pthread_mutex_init(&mutex_liste_threads, &attributs_mutex); |
pthread_mutex_init(&mutex_liste_threads, &attributs_mutex); |
pthread_mutexattr_destroy(&attributs_mutex); |
pthread_mutexattr_destroy(&attributs_mutex); |
|
|
|
pthread_mutexattr_init(&attributs_mutex); |
|
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL); |
|
pthread_mutex_init(&((*s_etat_processus).mutex_pile_processus), |
|
&attributs_mutex); |
|
pthread_mutexattr_destroy(&attributs_mutex); |
|
|
|
pthread_mutexattr_init(&attributs_mutex); |
|
pthread_mutexattr_settype(&attributs_mutex, PTHREAD_MUTEX_NORMAL); |
|
pthread_mutex_init(&((*s_etat_processus).mutex_allocation), |
|
&attributs_mutex); |
|
pthread_mutexattr_destroy(&attributs_mutex); |
|
|
liberation_queue_signaux(s_etat_processus); |
liberation_queue_signaux(s_etat_processus); |
creation_queue_signaux(s_etat_processus); |
creation_queue_signaux(s_etat_processus); |
|
|
Line 1600 instruction_detach(struct_processus *s_e
|
Line 1621 instruction_detach(struct_processus *s_e
|
|
|
// Attente de la réception du signal rpl_sigstart. |
// Attente de la réception du signal rpl_sigstart. |
|
|
for((*s_etat_processus).demarrage_fils = d_faux;;) |
for((*s_etat_processus).demarrage_fils = d_faux; |
|
(*s_etat_processus).demarrage_fils != d_vrai; |
|
nanosleep(&attente, NULL)) |
{ |
{ |
scrutation_interruptions(s_etat_processus); |
scrutation_interruptions(s_etat_processus); |
|
|
if ((*s_etat_processus).demarrage_fils == d_vrai) |
|
{ |
|
break; |
|
} |
|
|
|
nanosleep(&attente, NULL); |
|
} |
} |
|
|
(*s_etat_processus).niveau_initial = (*s_etat_processus).niveau_courant; |
(*s_etat_processus).niveau_initial = (*s_etat_processus).niveau_courant; |
Line 1915 instruction_detach(struct_processus *s_e
|
Line 1931 instruction_detach(struct_processus *s_e
|
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
|
|
|
(*s_etat_processus).s_fichiers = NULL; |
|
|
/* |
/* |
* Destruction des piles de connecteurs SQL |
* Destruction des piles de connecteurs SQL |
*/ |
*/ |
Line 1937 instruction_detach(struct_processus *s_e
|
Line 1955 instruction_detach(struct_processus *s_e
|
l_element_courant = l_element_suivant; |
l_element_courant = l_element_suivant; |
} |
} |
|
|
(*s_etat_processus).s_connecteurs_sql = NULL; |
|
|
|
/* |
/* |
* On ne détruit pas les sockets car il faut utiliser DETACH |
* On ne détruit pas les sockets car il faut utiliser DETACH |
* pour traiter plusieurs connexions simultanées sur les sockets |
* pour traiter plusieurs connexions simultanées sur les sockets |
*/ |
*/ |
|
|
(*s_etat_processus).s_fichiers = NULL; |
(*s_etat_processus).s_connecteurs_sql = NULL; |
|
|
if ((*s_etat_processus).debug == d_vrai) |
if ((*s_etat_processus).debug == d_vrai) |
{ |
{ |
Line 2805 instruction_detach(struct_processus *s_e
|
Line 2821 instruction_detach(struct_processus *s_e
|
liberation_profil(s_etat_processus); |
liberation_profil(s_etat_processus); |
} |
} |
|
|
closelog(); |
attente.tv_sec = 0; |
|
attente.tv_nsec = GRANULARITE_us * 1000; |
|
|
close((*s_argument_thread).pipe_erreurs[1]); |
while(nombre_thread_surveillance_processus != 0) |
close((*s_argument_thread).pipe_interruptions[1]); |
{ |
close((*s_argument_thread).pipe_nombre_elements_attente[1]); |
nanosleep(&attente, NULL); |
close((*s_argument_thread).pipe_objets[1]); |
INCR_GRANULARITE(attente.tv_nsec); |
close((*s_argument_thread).pipe_injections[0]); |
} |
close((*s_argument_thread).pipe_nombre_injections[0]); |
|
close((*s_argument_thread).pipe_acquittement[0]); |
closelog(); |
|
|
retrait_thread(s_etat_processus); |
retrait_thread(s_etat_processus); |
|
liberation_contexte_cas(s_etat_processus); |
|
destruction_queue_signaux(s_etat_processus); |
|
|
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
sem_post(&((*s_etat_processus).semaphore_fork)); |
sem_post(&((*s_etat_processus).semaphore_fork)); |
Line 2828 instruction_detach(struct_processus *s_e
|
Line 2847 instruction_detach(struct_processus *s_e
|
|
|
clear_history(); |
clear_history(); |
|
|
liberation_contexte_cas(s_etat_processus); |
close((*s_argument_thread).pipe_erreurs[1]); |
destruction_queue_signaux(s_etat_processus); |
close((*s_argument_thread).pipe_interruptions[1]); |
|
close((*s_argument_thread).pipe_nombre_elements_attente[1]); |
|
close((*s_argument_thread).pipe_objets[1]); |
|
close((*s_argument_thread).pipe_injections[0]); |
|
close((*s_argument_thread).pipe_nombre_injections[0]); |
|
close((*s_argument_thread).pipe_acquittement[0]); |
|
|
free((*s_etat_processus).localisation); |
free((*s_etat_processus).localisation); |
free((*s_etat_processus).chemin_fichiers_temporaires); |
free((*s_etat_processus).chemin_fichiers_temporaires); |
Line 2838 instruction_detach(struct_processus *s_e
|
Line 2862 instruction_detach(struct_processus *s_e
|
liberation_allocateur(s_etat_processus); |
liberation_allocateur(s_etat_processus); |
liberation_allocateur_buffer(s_etat_processus); |
liberation_allocateur_buffer(s_etat_processus); |
|
|
attente.tv_sec = 0; |
|
attente.tv_nsec = GRANULARITE_us * 1000; |
|
|
|
while(nombre_thread_surveillance_processus != 0) |
|
{ |
|
nanosleep(&attente, NULL); |
|
INCR_GRANULARITE(attente.tv_nsec); |
|
} |
|
|
|
pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_pile_processus)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_interruptions)); |
Line 2854 instruction_detach(struct_processus *s_e
|
Line 2869 instruction_detach(struct_processus *s_e
|
pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes)); |
pthread_mutex_destroy(&((*s_etat_processus).protection_liste_mutexes)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer)); |
pthread_mutex_destroy(&((*s_etat_processus).mutex_allocation_buffer)); |
pthread_mutex_destroy(&mutex_sections_critiques); |
pthread_mutex_destroy(&mutex_sections_critiques); |
|
pthread_mutex_destroy(&mutex_liste_variables_partagees); |
|
pthread_mutex_destroy(&mutex_liste_threads); |
|
|
sys_free(s_etat_processus); |
sys_free(s_etat_processus); |
|
|
Line 2970 instruction_detach(struct_processus *s_e
|
Line 2987 instruction_detach(struct_processus *s_e
|
} |
} |
|
|
return; |
return; |
|
#endif |
} |
} |
|
|
// vim: ts=4 |
// vim: ts=4 |