--- rpl/src/instructions_s1.c 2015/07/14 18:39:46 1.78 +++ rpl/src/instructions_s1.c 2018/12/24 15:56:26 1.92 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.22 - Copyright (C) 1989-2015 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.30 + Copyright (C) 1989-2018 Dr. BERTRAND Joël This file is part of RPL/2. @@ -59,34 +59,34 @@ instruction_swap(struct_processus *s_eta " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" - " %s\n", + " %s, %s\n", d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX, d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK, - d_SLB, d_PRC, d_MTX, d_SQL); + d_SLB, d_PRC, d_MTX, d_SQL, d_REC); printf(" 1: %s, %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" - " %s\n", + " %s, %s\n", d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX, d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK, - d_SLB, d_PRC, d_MTX, d_SQL); + d_SLB, d_PRC, d_MTX, d_SQL, d_REC); printf("-> 2: %s, %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" - " %s\n", + " %s, %s\n", d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX, d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK, - d_SLB, d_PRC, d_MTX, d_SQL); + d_SLB, d_PRC, d_MTX, d_SQL, d_REC); printf(" 1: %s, %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" - " %s\n", + " %s, %s\n", d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX, d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK, - d_SLB, d_PRC, d_MTX, d_SQL); + d_SLB, d_PRC, d_MTX, d_SQL, d_REC); return; } @@ -3155,10 +3155,10 @@ instruction_sto(struct_processus *s_etat " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" " %s, %s, %s, %s, %s,\n" - " %s\n", + " %s, %s\n", d_INT, d_REL, d_CPL, d_VIN, d_VRL, d_VCX, d_MIN, d_MRL, d_MCX, d_TAB, d_BIN, d_NOM, d_CHN, d_LST, d_ALG, d_RPN, d_FCH, d_SCK, - d_SLB, d_PRC, d_MTX, d_SQL); + d_SLB, d_PRC, d_MTX, d_SQL, d_REC); printf(" 1: %s\n", d_NOM); return; @@ -3690,7 +3690,6 @@ instruction_syseval(struct_processus *s_ verrouillage_threads_concurrents(s_etat_processus); pid = fork(); - deverrouillage_threads_concurrents(s_etat_processus); if (pid < 0) { @@ -3735,6 +3734,8 @@ instruction_syseval(struct_processus *s_ } else if (pid == 0) { + (*s_etat_processus).erreur_systeme = d_es; + if (close(pipes_entree[1]) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; @@ -3820,6 +3821,8 @@ instruction_syseval(struct_processus *s_ } else { + deverrouillage_threads_concurrents(s_etat_processus); + if (close(pipes_entree[0]) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; @@ -3985,21 +3988,25 @@ instruction_syseval(struct_processus *s_ return; } - if (waitpid(pid, &status, 0) == -1) + while(waitpid(pid, &status, 0) == -1) { -# ifndef SEMAPHORES_NOMMES - if (sem_post(&((*s_etat_processus).semaphore_fork)) - != 0) -# else - if (sem_post((*s_etat_processus).semaphore_fork) != 0) -# endif + if (errno != EINTR) { +# ifndef SEMAPHORES_NOMMES + if (sem_post(&((*s_etat_processus).semaphore_fork)) + != 0) +# else + if (sem_post((*s_etat_processus).semaphore_fork) + != 0) +# endif + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + (*s_etat_processus).erreur_systeme = d_es_processus; return; } - - (*s_etat_processus).erreur_systeme = d_es_processus; - return; } # ifndef SEMAPHORES_NOMMES