version 1.38, 2010/08/31 09:57:43
|
version 1.44, 2010/12/10 16:08:27
|
Line 1
|
Line 1
|
/* |
/* |
================================================================================ |
================================================================================ |
RPL/2 (R) version 4.0.19 |
RPL/2 (R) version 4.0.20 |
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 183 insertion_thread_surveillance(struct_pro
|
Line 183 insertion_thread_surveillance(struct_pro
|
} |
} |
} |
} |
|
|
pthread_mutex_lock(&((*s_argument_thread).mutex)); |
pthread_mutex_lock(&((*s_argument_thread).mutex_nombre_references)); |
(*s_argument_thread).nombre_references++; |
(*s_argument_thread).nombre_references++; |
pthread_mutex_unlock(&((*s_argument_thread).mutex)); |
pthread_mutex_unlock(&((*s_argument_thread).mutex_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 378 retrait_thread_surveillance(struct_proce
|
Line 378 retrait_thread_surveillance(struct_proce
|
(*l_element_precedent).suivant = (*l_element_courant).suivant; |
(*l_element_precedent).suivant = (*l_element_courant).suivant; |
} |
} |
|
|
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_lock(&((*s_argument_thread).mutex_nombre_references)) |
|
!= 0) |
{ |
{ |
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 400 retrait_thread_surveillance(struct_proce
|
Line 401 retrait_thread_surveillance(struct_proce
|
|
|
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_nombre_references)) != 0) |
{ |
{ |
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 415 retrait_thread_surveillance(struct_proce
|
Line 417 retrait_thread_surveillance(struct_proce
|
} |
} |
|
|
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
|
pthread_mutex_destroy(&((*s_argument_thread).mutex_nombre_references)); |
free(s_argument_thread); |
free(s_argument_thread); |
} |
} |
else |
else |
{ |
{ |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_unlock(&((*s_argument_thread) |
|
.mutex_nombre_references)) != 0) |
{ |
{ |
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 676 liberation_threads(struct_processus *s_e
|
Line 680 liberation_threads(struct_processus *s_e
|
s_argument_thread = (struct_descripteur_thread *) |
s_argument_thread = (struct_descripteur_thread *) |
(*((struct_liste_chainee *) element_courant)).donnee; |
(*((struct_liste_chainee *) element_courant)).donnee; |
|
|
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_lock(&((*s_argument_thread) |
|
.mutex_nombre_references)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 700 liberation_threads(struct_processus *s_e
|
Line 705 liberation_threads(struct_processus *s_e
|
close((*s_argument_thread) |
close((*s_argument_thread) |
.pipe_nombre_interruptions_attente[0]); |
.pipe_nombre_interruptions_attente[0]); |
|
|
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) |
if (pthread_mutex_unlock(&((*s_argument_thread) |
!= 0) |
.mutex_nombre_references)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 709 liberation_threads(struct_processus *s_e
|
Line 714 liberation_threads(struct_processus *s_e
|
} |
} |
|
|
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
|
pthread_mutex_destroy(&((*s_argument_thread) |
|
.mutex_nombre_references)); |
|
|
if ((*s_argument_thread).processus_detache == d_faux) |
if ((*s_argument_thread).processus_detache == d_faux) |
{ |
{ |
Line 723 liberation_threads(struct_processus *s_e
|
Line 730 liberation_threads(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) |
if (pthread_mutex_unlock(&((*s_argument_thread) |
!= 0) |
.mutex_nombre_references)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 1350 liberation_threads(struct_processus *s_e
|
Line 1357 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; |
|
|
if (pthread_mutex_lock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_lock(&((*s_argument_thread).mutex_nombre_references)) |
|
!= 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 1373 liberation_threads(struct_processus *s_e
|
Line 1381 liberation_threads(struct_processus *s_e
|
close((*s_argument_thread).pipe_interruptions[0]); |
close((*s_argument_thread).pipe_interruptions[0]); |
close((*s_argument_thread).pipe_nombre_interruptions_attente[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_nombre_references)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 1381 liberation_threads(struct_processus *s_e
|
Line 1390 liberation_threads(struct_processus *s_e
|
} |
} |
|
|
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
pthread_mutex_destroy(&((*s_argument_thread).mutex)); |
|
pthread_mutex_destroy(&((*s_argument_thread) |
|
.mutex_nombre_references)); |
|
|
if ((*s_argument_thread).processus_detache == d_faux) |
if ((*s_argument_thread).processus_detache == d_faux) |
{ |
{ |
Line 1394 liberation_threads(struct_processus *s_e
|
Line 1405 liberation_threads(struct_processus *s_e
|
} |
} |
else |
else |
{ |
{ |
if (pthread_mutex_unlock(&((*s_argument_thread).mutex)) != 0) |
if (pthread_mutex_unlock(&((*s_argument_thread) |
|
.mutex_nombre_references)) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
sem_post(&semaphore_liste_threads); |
sem_post(&semaphore_liste_threads); |
Line 1592 verrouillage_gestionnaire_signaux()
|
Line 1604 verrouillage_gestionnaire_signaux()
|
// ce que ce soit possible. |
// ce que ce soit possible. |
|
|
# ifndef SEMAPHORES_NOMMES |
# ifndef SEMAPHORES_NOMMES |
while(sem_trywait(&semaphore_liste_threads) == -1) |
while(sem_wait(&semaphore_liste_threads) == -1) |
# else |
# else |
while(sem_trywait(semaphore_liste_threads) == -1) |
while(sem_wait(semaphore_liste_threads) == -1) |
# endif |
# endif |
{ |
{ |
perror("sem_trywait"); |
if (errno != EINTR) |
if ((errno != EINTR) && (errno != EAGAIN)) |
|
{ |
{ |
pthread_sigmask(SIG_SETMASK, &oldset, NULL); |
pthread_sigmask(SIG_SETMASK, &oldset, NULL); |
|
|
Line 1614 verrouillage_gestionnaire_signaux()
|
Line 1625 verrouillage_gestionnaire_signaux()
|
BUG(1, uprintf("Lock error !\n")); |
BUG(1, uprintf("Lock error !\n")); |
return; |
return; |
} |
} |
|
|
sched_yield(); |
|
} |
} |
} |
} |
|
|
Line 1739 interruption1(SIGHANDLER_ARGS)
|
Line 1748 interruption1(SIGHANDLER_ARGS)
|
verrouillage_gestionnaire_signaux(); |
verrouillage_gestionnaire_signaux(); |
|
|
# ifdef _BROKEN_SIGINFO |
# ifdef _BROKEN_SIGINFO |
if (signal == SIGINT) |
if ((signal == SIGINT) || (signal == SIGTERM)) |
{ |
{ |
// Si l'interruption provient du clavier, il n'y a pas eu d'appel |
// Si l'interruption provient du clavier, il n'y a pas eu d'appel |
// à queue_in(). |
// à queue_in(). |
Line 1751 interruption1(SIGHANDLER_ARGS)
|
Line 1760 interruption1(SIGHANDLER_ARGS)
|
pid = origine_signal(signal); |
pid = origine_signal(signal); |
} |
} |
# else |
# else |
pid = (*siginfo).si_pid; |
if (siginfo != NULL) |
|
{ |
|
pid = (*siginfo).si_pid; |
|
} |
|
else |
|
{ |
|
pid = getpid(); |
|
} |
# endif |
# endif |
|
|
switch(signal) |
switch(signal) |
Line 1796 interruption1(SIGHANDLER_ARGS)
|
Line 1812 interruption1(SIGHANDLER_ARGS)
|
} |
} |
|
|
case SIGINT : |
case SIGINT : |
|
case SIGTERM : |
{ |
{ |
/* |
/* |
* Une vieille spécification POSIX permet au pointeur siginfo |
* Une vieille spécification POSIX permet au pointeur siginfo |
Line 1821 interruption1(SIGHANDLER_ARGS)
|
Line 1838 interruption1(SIGHANDLER_ARGS)
|
|
|
if (((*s_etat_processus).type_debug & d_debug_signaux) != 0) |
if (((*s_etat_processus).type_debug & d_debug_signaux) != 0) |
{ |
{ |
printf("[%d] SIGINT (thread %llu)\n", (int) getpid(), |
if (signal == SIGINT) |
(unsigned long long) pthread_self()); |
{ |
|
printf("[%d] SIGINT (thread %llu)\n", (int) getpid(), |
|
(unsigned long long) pthread_self()); |
|
} |
|
else |
|
{ |
|
printf("[%d] SIGTERM (thread %llu)\n", (int) getpid(), |
|
(unsigned long long) pthread_self()); |
|
} |
|
|
fflush(stdout); |
fflush(stdout); |
} |
} |
|
|
Line 1844 interruption1(SIGHANDLER_ARGS)
|
Line 1870 interruption1(SIGHANDLER_ARGS)
|
return; |
return; |
} |
} |
|
|
if (strncmp(getenv("LANG"), "fr", 2) == 0) |
if (signal == SIGINT) |
{ |
{ |
printf("+++Interruption\n"); |
if (strncmp(getenv("LANG"), "fr", 2) == 0) |
} |
{ |
else |
printf("+++Interruption\n"); |
{ |
} |
printf("+++Interrupt\n"); |
else |
} |
{ |
|
printf("+++Interrupt\n"); |
|
} |
|
|
fflush(stdout); |
fflush(stdout); |
|
} |
|
|
(*s_etat_processus).var_volatile_requete_arret = -1; |
(*s_etat_processus).var_volatile_requete_arret = -1; |
(*s_etat_processus).var_volatile_alarme = -1; |
(*s_etat_processus).var_volatile_alarme = -1; |
Line 1898 interruption2(SIGHANDLER_ARGS)
|
Line 1927 interruption2(SIGHANDLER_ARGS)
|
# ifdef _BROKEN_SIGINFO |
# ifdef _BROKEN_SIGINFO |
pid = origine_signal(signal); |
pid = origine_signal(signal); |
# else |
# else |
pid = (*siginfo).si_pid; |
if (siginfo != NULL) |
|
{ |
|
pid = (*siginfo).si_pid; |
|
} |
|
else |
|
{ |
|
pid = getpid(); |
|
} |
# endif |
# endif |
|
|
# ifndef _BROKEN_SIGINFO |
# ifndef _BROKEN_SIGINFO |