--- rpl/src/instructions_w1.c 2013/04/01 15:29:38 1.82 +++ rpl/src/instructions_w1.c 2013/05/28 22:09:55 1.84 @@ -289,11 +289,25 @@ instruction_wait(struct_processus *s_eta scrutation_injection(s_etat_processus); + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) + { + (*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) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { traitement_interruptions_logicielles(s_etat_processus); @@ -2279,13 +2293,26 @@ instruction_wflock(struct_processus *s_e } else { + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) + { + (*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 ((*s_etat_processus).nombre_interruptions_en_queue - != 0) + if (pthread_mutex_unlock(&(*s_etat_processus) + .mutex_interruptions) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { registre_instruction_valide = (*s_etat_processus).instruction_valide; @@ -2544,8 +2571,11 @@ instruction_wfproc(struct_processus *s_e * Le processus n'est pas terminé */ - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + 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); @@ -2562,8 +2592,34 @@ instruction_wfproc(struct_processus *s_e affectation_interruptions_logicielles(s_etat_processus); } - if ((*s_etat_processus).nombre_interruptions_en_queue - != 0) + 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) + { + profilage(s_etat_processus, NULL); + } + + (*s_etat_processus).erreur_systeme = + d_es_processus; + return; + } + + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { registre_instruction_valide = (*s_etat_processus).instruction_valide; @@ -2871,12 +2927,26 @@ instruction_wfdata(struct_processus *s_e scrutation_injection(s_etat_processus); + if (pthread_mutex_lock(&(*s_etat_processus) + .mutex_interruptions) != 0) + { + (*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) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { registre_instruction_valide = @@ -3607,11 +3677,25 @@ instruction_wfswi(struct_processus *s_et return; } + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) + { + (*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) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if ((*s_etat_processus).queue_interruptions[interruption - 1] > 0) { drapeau_fin = d_vrai; @@ -3744,11 +3828,23 @@ instruction_wfpoke(struct_processus *s_e scrutation_injection(s_etat_processus); + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0) + { + (*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) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { registre_instruction_valide = @@ -3851,11 +3947,23 @@ instruction_wfack(struct_processus *s_et { scrutation_injection(s_etat_processus); + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) != 0) + { + (*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) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + if ((*s_etat_processus).nombre_interruptions_en_queue != 0) { registre_instruction_valide =