--- rpl/src/instructions_w1.c 2013/05/23 12:45:08 1.83 +++ rpl/src/instructions_w1.c 2013/05/28 22:09:55 1.84 @@ -289,7 +289,8 @@ instruction_wait(struct_processus *s_eta scrutation_injection(s_etat_processus); - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -300,7 +301,8 @@ instruction_wait(struct_processus *s_eta affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2291,7 +2293,8 @@ instruction_wflock(struct_processus *s_e } else { - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2302,7 +2305,8 @@ instruction_wflock(struct_processus *s_e affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus) + .mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2567,12 +2571,42 @@ instruction_wfproc(struct_processus *s_e * Le processus n'est pas terminé */ + if (pthread_mutex_lock(&((*s_etat_processus) + .mutex_interruptions)) != 0) + { + pthread_mutex_unlock(&((*s_etat_processus).mutex)); + + if ((*s_etat_processus).profilage == d_vrai) + { + profilage(s_etat_processus, NULL); + } + + (*s_etat_processus).erreur_systeme = + d_es_processus; + return; + } + if ((*s_etat_processus).nombre_interruptions_non_affectees != 0) { affectation_interruptions_logicielles(s_etat_processus); } + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_interruptions)) != 0) + { + pthread_mutex_unlock(&((*s_etat_processus).mutex)); + + if ((*s_etat_processus).profilage == d_vrai) + { + profilage(s_etat_processus, NULL); + } + + (*s_etat_processus).erreur_systeme = + d_es_processus; + return; + } + if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) { if ((*s_etat_processus).profilage == d_vrai) @@ -2893,7 +2927,8 @@ instruction_wfdata(struct_processus *s_e scrutation_injection(s_etat_processus); - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus) + .mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2905,7 +2940,8 @@ instruction_wfdata(struct_processus *s_e affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus) + .mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3641,7 +3677,8 @@ instruction_wfswi(struct_processus *s_et return; } - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3652,7 +3689,8 @@ instruction_wfswi(struct_processus *s_et affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3790,7 +3828,7 @@ instruction_wfpoke(struct_processus *s_e scrutation_injection(s_etat_processus); - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3801,7 +3839,7 @@ instruction_wfpoke(struct_processus *s_e affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3909,7 +3947,7 @@ instruction_wfack(struct_processus *s_et { scrutation_injection(s_etat_processus); - if (pthread_mutex_lock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3920,7 +3958,7 @@ instruction_wfack(struct_processus *s_et affectation_interruptions_logicielles(s_etat_processus); } - if (pthread_mutex_unlock(&(*s_etat_processus).mutex) != 0) + if (pthread_mutex_unlock(&(*s_etat_processus).mutex_interruptions) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return;