version 1.143, 2014/05/17 15:35:51
|
version 1.157, 2015/02/19 11:01:28
|
Line 1
|
Line 1
|
/* |
/* |
================================================================================ |
================================================================================ |
RPL/2 (R) version 4.1.18 |
RPL/2 (R) version 4.1.21 |
Copyright (C) 1989-2014 Dr. BERTRAND Joël |
Copyright (C) 1989-2015 Dr. BERTRAND Joël |
|
|
This file is part of RPL/2. |
This file is part of RPL/2. |
|
|
Line 1265 liberation_threads(struct_processus *s_e
|
Line 1265 liberation_threads(struct_processus *s_e
|
# endif |
# endif |
|
|
liberation_contexte_cas(s_etat_processus); |
liberation_contexte_cas(s_etat_processus); |
free(s_etat_processus); |
liberation_allocateur_buffer(s_etat_processus); |
|
sys_free(s_etat_processus); |
|
|
s_etat_processus = candidat; |
s_etat_processus = candidat; |
} |
} |
Line 1468 verrouillage_gestionnaire_signaux(struct
|
Line 1469 verrouillage_gestionnaire_signaux(struct
|
return; |
return; |
} |
} |
|
|
# ifndef SEMAPHORES_NOMMES |
|
if (sem_post(&semaphore_gestionnaires_signaux) == -1) |
|
# else |
|
if (sem_post(semaphore_gestionnaires_signaux) == -1) |
|
# endif |
|
{ |
|
# ifndef SEMAPHORES_NOMMES |
|
sem_wait(&((*s_etat_processus).semaphore_fork)); |
|
# else |
|
sem_wait((*s_etat_processus).semaphore_fork); |
|
# endif |
|
BUG(1, uprintf("Lock error !\n")); |
|
return; |
|
} |
|
|
|
return; |
return; |
} |
} |
|
|
Line 1747 interruption4(int signal)
|
Line 1733 interruption4(int signal)
|
test_signal(signal); |
test_signal(signal); |
|
|
signal_tronque = (unsigned char) (rpl_sighup & 0xFF); |
signal_tronque = (unsigned char) (rpl_sighup & 0xFF); |
|
|
|
# pragma GCC diagnostic push |
|
# pragma GCC diagnostic ignored "-Wunused-result" |
|
|
write(pipe_signaux, &signal_tronque, sizeof(signal_tronque)); |
write(pipe_signaux, &signal_tronque, sizeof(signal_tronque)); |
|
|
|
# pragma GCC diagnostic pop |
|
|
return; |
return; |
} |
} |
|
|
Line 2057 interruption_violation_access(void *adre
|
Line 2050 interruption_violation_access(void *adre
|
return(0); |
return(0); |
} |
} |
|
|
|
# pragma GCC diagnostic push |
|
# pragma GCC diagnostic ignored "-Wunused-result" |
|
|
write(STDERR_FILENO, message, strlen(message)); |
write(STDERR_FILENO, message, strlen(message)); |
|
|
|
# pragma GCC diagnostic pop |
|
|
if (pid_processus_pere == getpid()) |
if (pid_processus_pere == getpid()) |
{ |
{ |
longjmp(contexte_initial, -1); |
longjmp(contexte_initial, -1); |
Line 2469 scrutation_interruptions(struct_processu
|
Line 2467 scrutation_interruptions(struct_processu
|
((*s_queue_signaux).pointeur_lecture + 1) |
((*s_queue_signaux).pointeur_lecture + 1) |
% LONGUEUR_QUEUE_SIGNAUX; |
% LONGUEUR_QUEUE_SIGNAUX; |
|
|
|
# ifndef IPCS_SYSV |
if (msync(s_queue_signaux, sizeof(s_queue_signaux), |
if (msync(s_queue_signaux, sizeof(s_queue_signaux), |
MS_ASYNC | MS_INVALIDATE) != 0) |
MS_ASYNC | MS_INVALIDATE) != 0) |
{ |
{ |
(*s_etat_processus).erreur_systeme = d_es_processus; |
(*s_etat_processus).erreur_systeme = d_es_processus; |
return; |
return; |
} |
} |
|
# endif |
|
|
while(sem_wait(semaphore_signalisation) != 0) |
while(sem_wait(semaphore_signalisation) != 0) |
{ |
{ |
Line 2544 nom_segment(unsigned char *chemin, pid_t
|
Line 2544 nom_segment(unsigned char *chemin, pid_t
|
# ifdef IPCS_SYSV // !POSIX |
# ifdef IPCS_SYSV // !POSIX |
# ifndef OS2 // !OS2 |
# ifndef OS2 // !OS2 |
|
|
if ((fichier = malloc((strlen(chemin) + 1 + 256 + 1) * |
if ((fichier = sys_malloc((strlen(chemin) + 1 + 256 + 1) * |
sizeof(unsigned char))) == NULL) |
sizeof(unsigned char))) == NULL) |
{ |
{ |
return(NULL); |
return(NULL); |
Line 2552 nom_segment(unsigned char *chemin, pid_t
|
Line 2552 nom_segment(unsigned char *chemin, pid_t
|
|
|
sprintf(fichier, "%s/RPL-SIGQUEUES-%d", chemin, (int) pid); |
sprintf(fichier, "%s/RPL-SIGQUEUES-%d", chemin, (int) pid); |
# else // OS2 |
# else // OS2 |
if ((fichier = malloc((10 + 256 + 1) * sizeof(unsigned char))) |
if ((fichier = sys_malloc((10 + 256 + 1) * sizeof(unsigned char))) |
== NULL) |
== NULL) |
{ |
{ |
return(NULL); |
return(NULL); |
Line 2562 nom_segment(unsigned char *chemin, pid_t
|
Line 2562 nom_segment(unsigned char *chemin, pid_t
|
# endif // OS2 |
# endif // OS2 |
# else // POSIX |
# else // POSIX |
|
|
if ((fichier = malloc((1 + 256 + 1) * |
if ((fichier = sys_malloc((1 + 256 + 1) * |
sizeof(unsigned char))) == NULL) |
sizeof(unsigned char))) == NULL) |
{ |
{ |
return(NULL); |
return(NULL); |
Line 2639 envoi_signal_processus(pid_t pid, enum s
|
Line 2639 envoi_signal_processus(pid_t pid, enum s
|
((*s_queue_signaux).pointeur_ecriture + 1) |
((*s_queue_signaux).pointeur_ecriture + 1) |
% LONGUEUR_QUEUE_SIGNAUX; |
% LONGUEUR_QUEUE_SIGNAUX; |
|
|
|
# ifndef IPCS_SYSV |
if (msync(s_queue_signaux, sizeof(s_queue_signaux), |
if (msync(s_queue_signaux, sizeof(s_queue_signaux), |
MS_ASYNC | MS_INVALIDATE) != 0) |
MS_ASYNC | MS_INVALIDATE) != 0) |
{ |
{ |
return(1); |
return(1); |
} |
} |
|
# endif |
|
|
if (sem_post(semaphore_queue_signaux) != 0) |
if (sem_post(semaphore_queue_signaux) != 0) |
{ |
{ |
Line 2668 envoi_signal_processus(pid_t pid, enum s
|
Line 2670 envoi_signal_processus(pid_t pid, enum s
|
# ifndef OS2 // SysV |
# ifndef OS2 // SysV |
if ((desc = open(nom, O_RDWR)) == -1) |
if ((desc = open(nom, O_RDWR)) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
return(1); |
return(1); |
} |
} |
|
|
Line 2676 envoi_signal_processus(pid_t pid, enum s
|
Line 2678 envoi_signal_processus(pid_t pid, enum s
|
|
|
if ((clef = ftok(nom, 1)) == -1) |
if ((clef = ftok(nom, 1)) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
return(1); |
return(1); |
} |
} |
|
|
free(nom); |
sys_free(nom); |
|
|
if ((segment = shmget(clef, sizeof(struct_queue_signaux), 0)) |
if ((segment = shmget(clef, sizeof(struct_queue_signaux), 0)) |
== -1) |
== -1) |
Line 2693 envoi_signal_processus(pid_t pid, enum s
|
Line 2695 envoi_signal_processus(pid_t pid, enum s
|
if (DosGetNamedSharedMem((PVOID) &queue, nom, |
if (DosGetNamedSharedMem((PVOID) &queue, nom, |
PAG_WRITE | PAG_READ) != 0) |
PAG_WRITE | PAG_READ) != 0) |
{ |
{ |
free(nom); |
sys_free(nom); |
return(1); |
return(1); |
} |
} |
|
|
free(nom); |
sys_free(nom); |
# endif |
# endif |
# else // POSIX |
# else // POSIX |
if ((nom = nom_segment(racine_segment, pid)) == NULL) |
if ((nom = nom_segment(racine_segment, pid)) == NULL) |
Line 2707 envoi_signal_processus(pid_t pid, enum s
|
Line 2709 envoi_signal_processus(pid_t pid, enum s
|
|
|
if ((segment = shm_open(nom, O_RDWR, 0)) == -1) |
if ((segment = shm_open(nom, O_RDWR, 0)) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
return(1); |
return(1); |
} |
} |
|
|
free(nom); |
sys_free(nom); |
|
|
if ((queue = mmap(NULL, sizeof(struct_queue_signaux), |
if ((queue = mmap(NULL, sizeof(struct_queue_signaux), |
PROT_READ | PROT_WRITE, MAP_SHARED, segment, 0)) == |
PROT_READ | PROT_WRITE, MAP_SHARED, segment, 0)) == |
Line 2752 envoi_signal_processus(pid_t pid, enum s
|
Line 2754 envoi_signal_processus(pid_t pid, enum s
|
(*queue).pointeur_ecriture = ((*queue).pointeur_ecriture + 1) |
(*queue).pointeur_ecriture = ((*queue).pointeur_ecriture + 1) |
% LONGUEUR_QUEUE_SIGNAUX; |
% LONGUEUR_QUEUE_SIGNAUX; |
|
|
|
# ifndef IPCS_SYSV |
if (msync(queue, sizeof(queue), MS_ASYNC | MS_INVALIDATE) != 0) |
if (msync(queue, sizeof(queue), MS_ASYNC | MS_INVALIDATE) != 0) |
{ |
{ |
sem_close(semaphore); |
sem_close(semaphore); |
sem_close(signalisation); |
sem_close(signalisation); |
return(1); |
return(1); |
} |
} |
|
# endif |
|
|
if (sem_post(semaphore) != 0) |
if (sem_post(semaphore) != 0) |
{ |
{ |
Line 2926 creation_queue_signaux(struct_processus
|
Line 2930 creation_queue_signaux(struct_processus
|
if ((f_queue_signaux = shm_open(nom, O_RDWR | O_CREAT | O_EXCL, |
if ((f_queue_signaux = shm_open(nom, O_RDWR | O_CREAT | O_EXCL, |
S_IRUSR | S_IWUSR)) == -1) |
S_IRUSR | S_IWUSR)) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
|
|
if (ftruncate(f_queue_signaux, sizeof(struct_queue_signaux)) == -1) |
if (ftruncate(f_queue_signaux, sizeof(struct_queue_signaux)) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
Line 2945 creation_queue_signaux(struct_processus
|
Line 2949 creation_queue_signaux(struct_processus
|
{ |
{ |
if (shm_unlink(nom) == -1) |
if (shm_unlink(nom) == -1) |
{ |
{ |
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
|
|
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
|
|
free(nom); |
sys_free(nom); |
|
|
if ((semaphore_queue_signaux = sem_init2(1, getpid(), SEM_QUEUE)) |
if ((semaphore_queue_signaux = sem_init2(1, getpid(), SEM_QUEUE)) |
== SEM_FAILED) |
== SEM_FAILED) |
Line 3019 creation_queue_signaux(struct_processus
|
Line 3023 creation_queue_signaux(struct_processus
|
} |
} |
|
|
close(support); |
close(support); |
free(nom); |
sys_free(nom); |
|
|
if ((segment = shmget(clef, sizeof(struct_queue_signaux), |
if ((segment = shmget(clef, sizeof(struct_queue_signaux), |
IPC_CREAT | IPC_EXCL | S_IRUSR | S_IWUSR)) == -1) |
IPC_CREAT | IPC_EXCL | S_IRUSR | S_IWUSR)) == -1) |
Line 3079 creation_queue_signaux(struct_processus
|
Line 3083 creation_queue_signaux(struct_processus
|
sizeof(struct_queue_signaux), |
sizeof(struct_queue_signaux), |
PAG_WRITE | PAG_READ | PAG_COMMIT) != 0) |
PAG_WRITE | PAG_READ | PAG_COMMIT) != 0) |
{ |
{ |
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
|
|
free(nom); |
sys_free(nom); |
|
|
sem_init(&((*s_queue_signaux).semaphore), 1, 1); |
sem_init(&((*s_queue_signaux).semaphore), 1, 1); |
sem_init(&((*s_queue_signaux).signalisation), 1, 0); |
sem_init(&((*s_queue_signaux).signalisation), 1, 0); |
Line 3169 void
|
Line 3173 void
|
liberation_queue_signaux(struct_processus *s_etat_processus) |
liberation_queue_signaux(struct_processus *s_etat_processus) |
{ |
{ |
sem_wait(semaphore_arret_signalisation); |
sem_wait(semaphore_arret_signalisation); |
|
|
(*s_queue_signaux).requete_arret = d_vrai; |
(*s_queue_signaux).requete_arret = d_vrai; |
|
|
|
# ifndef IPCS_SYSV |
msync(s_queue_signaux, sizeof(s_queue_signaux), MS_ASYNC | MS_INVALIDATE); |
msync(s_queue_signaux, sizeof(s_queue_signaux), MS_ASYNC | MS_INVALIDATE); |
|
# endif |
|
|
sem_post(semaphore_arret_signalisation); |
sem_post(semaphore_arret_signalisation); |
|
|
// Incrémenter le sémaphore pour être sûr de le débloquer. |
// Incrémenter le sémaphore pour être sûr de le débloquer. |
|
|
sem_post(semaphore_signalisation); |
sem_post(semaphore_signalisation); |
|
|
pthread_join((*s_queue_signaux).thread_signaux, NULL); |
pthread_join((*s_queue_signaux).thread_signaux, NULL); |
|
|
# ifdef IPCS_SYSV // SystemV |
# ifdef IPCS_SYSV // SystemV |
Line 3231 destruction_queue_signaux(struct_process
|
Line 3236 destruction_queue_signaux(struct_process
|
sem_wait(semaphore_arret_signalisation); |
sem_wait(semaphore_arret_signalisation); |
|
|
(*s_queue_signaux).requete_arret = d_vrai; |
(*s_queue_signaux).requete_arret = d_vrai; |
|
|
|
# ifndef IPCS_SYSV |
msync(s_queue_signaux, sizeof(s_queue_signaux), MS_ASYNC | MS_INVALIDATE); |
msync(s_queue_signaux, sizeof(s_queue_signaux), MS_ASYNC | MS_INVALIDATE); |
|
# endif |
|
|
sem_post(semaphore_arret_signalisation); |
sem_post(semaphore_arret_signalisation); |
|
|
// Incrémenter le sémaphore pour être sûr de le débloquer. |
// Incrémenter le sémaphore pour être sûr de le débloquer. |
|
|
sem_post(semaphore_signalisation); |
sem_post(semaphore_signalisation); |
|
|
pthread_join((*s_queue_signaux).thread_signaux, NULL); |
pthread_join((*s_queue_signaux).thread_signaux, NULL); |
|
|
# ifdef IPCS_SYSV // SystemV |
# ifdef IPCS_SYSV // SystemV |
Line 3251 destruction_queue_signaux(struct_process
|
Line 3259 destruction_queue_signaux(struct_process
|
} |
} |
|
|
unlink((*semaphore_queue_signaux).path); |
unlink((*semaphore_queue_signaux).path); |
free((*semaphore_queue_signaux).path); |
sys_free((*semaphore_queue_signaux).path); |
|
|
if (semctl((*semaphore_signalisation).sem, 0, IPC_RMID) == -1) |
if (semctl((*semaphore_signalisation).sem, 0, IPC_RMID) == -1) |
{ |
{ |
Line 3260 destruction_queue_signaux(struct_process
|
Line 3268 destruction_queue_signaux(struct_process
|
} |
} |
|
|
unlink((*semaphore_signalisation).path); |
unlink((*semaphore_signalisation).path); |
free((*semaphore_signalisation).path); |
sys_free((*semaphore_signalisation).path); |
|
|
if (semctl((*semaphore_arret_signalisation).sem, 0, IPC_RMID) == -1) |
if (semctl((*semaphore_arret_signalisation).sem, 0, IPC_RMID) == -1) |
{ |
{ |
Line 3269 destruction_queue_signaux(struct_process
|
Line 3277 destruction_queue_signaux(struct_process
|
} |
} |
|
|
unlink((*semaphore_arret_signalisation).path); |
unlink((*semaphore_arret_signalisation).path); |
free((*semaphore_arret_signalisation).path); |
sys_free((*semaphore_arret_signalisation).path); |
|
|
if (shmdt(s_queue_signaux) == -1) |
if (shmdt(s_queue_signaux) == -1) |
{ |
{ |
Line 3291 destruction_queue_signaux(struct_process
|
Line 3299 destruction_queue_signaux(struct_process
|
} |
} |
|
|
unlink(nom); |
unlink(nom); |
free(nom); |
sys_free(nom); |
# else |
# else |
sem_close(&((*s_queue_signaux).semaphore)); |
sem_close(&((*s_queue_signaux).semaphore)); |
sem_destroy(&((*s_queue_signaux).semaphore)); |
sem_destroy(&((*s_queue_signaux).semaphore)); |
Line 3309 destruction_queue_signaux(struct_process
|
Line 3317 destruction_queue_signaux(struct_process
|
} |
} |
# endif |
# endif |
# else // POSIX |
# else // POSIX |
sem_close(semaphore_queue_signaux); |
|
sem_destroy2(semaphore_queue_signaux, getpid(), SEM_QUEUE); |
sem_destroy2(semaphore_queue_signaux, getpid(), SEM_QUEUE); |
|
|
sem_close(semaphore_signalisation); |
|
sem_destroy2(semaphore_signalisation, getpid(), SEM_SIGNALISATION); |
sem_destroy2(semaphore_signalisation, getpid(), SEM_SIGNALISATION); |
|
|
sem_close(semaphore_arret_signalisation); |
|
sem_destroy2(semaphore_arret_signalisation, getpid(), |
sem_destroy2(semaphore_arret_signalisation, getpid(), |
SEM_ARRET_SIGNALISATION); |
SEM_ARRET_SIGNALISATION); |
|
|
Line 3335 destruction_queue_signaux(struct_process
|
Line 3338 destruction_queue_signaux(struct_process
|
|
|
if (shm_unlink(nom) != 0) |
if (shm_unlink(nom) != 0) |
{ |
{ |
free(nom); |
sys_free(nom); |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
(*s_etat_processus).erreur_systeme = d_es_allocation_memoire; |
return; |
return; |
} |
} |
|
|
free(nom); |
sys_free(nom); |
# endif |
# endif |
|
|
return; |
return; |