--- rpl/src/instructions_w1.c 2013/05/23 12:45:08 1.83 +++ rpl/src/instructions_w1.c 2015/01/27 14:18:08 1.94 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.14 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.20 + Copyright (C) 1989-2015 Dr. BERTRAND Joël This file is part of RPL/2. @@ -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; @@ -710,7 +712,8 @@ instruction_write(struct_processus *s_et free(chaine); - if (alsprintf(&commande, "insert or replace into data " + if (alsprintf(s_etat_processus, &commande, + "insert or replace into data " "(id, data) values (%lld, '%s')", (*((integer8 *) (*s_objet_argument_2).objet)), chaine_utf8) < 0) { @@ -760,8 +763,8 @@ instruction_write(struct_processus *s_et // Récupération de la position de la clef - if (alsprintf(&commande, "select key from control " - "where id = 1") < 0) + if (alsprintf(s_etat_processus, &commande, + "select key from control where id = 1") < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -937,8 +940,8 @@ instruction_write(struct_processus *s_et // Récupération de l'identifiant de la clef - if (alsprintf(&commande, "select id from key where key = " - "'%s'", clef_utf8) < 0) + if (alsprintf(s_etat_processus, &commande, + "select id from key where key = '%s'", clef_utf8) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -983,8 +986,9 @@ instruction_write(struct_processus *s_et free(commande); - if (alsprintf(&commande, "insert into key " - "(key) values ('%s')", clef_utf8) < 0) + if (alsprintf(s_etat_processus, &commande, + "insert into key (key) values ('%s')", + clef_utf8) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1017,8 +1021,9 @@ instruction_write(struct_processus *s_et free(commande); - if (alsprintf(&commande, "select id from key " - "where key = '%s'", clef_utf8) < 0) + if (alsprintf(s_etat_processus, &commande, + "select id from key where key = '%s'", + clef_utf8) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1081,8 +1086,9 @@ instruction_write(struct_processus *s_et if (mise_a_jour == d_vrai) { - if (alsprintf(&commande, "update key set key = '%s' where " - "id = %lld", clef_utf8, id) < 0) + if (alsprintf(s_etat_processus, &commande, + "update key set key = '%s' where id = %lld", + clef_utf8, id) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1117,8 +1123,8 @@ instruction_write(struct_processus *s_et // Effacement de l'enregistrement existant - if (alsprintf(&commande, "delete from data where " - "key_id = %lld", id) < 0) + if (alsprintf(s_etat_processus, &commande, + "delete from data where key_id = %lld", id) < 0) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1252,8 +1258,8 @@ instruction_write(struct_processus *s_et free(chaine); - if (alsprintf(&commande, "insert into data " - "(data, key_id, sequence) values " + if (alsprintf(s_etat_processus, &commande, + "insert into data (data, key_id, sequence) values " "('%s', %lld, %lld)", chaine_utf8, id, ordre) < 0) { (*s_etat_processus).erreur_systeme = @@ -1492,9 +1498,9 @@ instruction_write(struct_processus *s_et return; } - if ((format_chaine = conversion_majuscule((unsigned char *) - (*(*l_element_courant_format).donnee).objet)) - == NULL) + if ((format_chaine = conversion_majuscule(s_etat_processus, + (unsigned char *) (*(*l_element_courant_format) + .donnee).objet)) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -2209,8 +2215,8 @@ instruction_wflock(struct_processus *s_e do { - if ((chaine = conversion_majuscule((unsigned char *) - (*s_objet_argument_1).objet)) == NULL) + if ((chaine = conversion_majuscule(s_etat_processus, + (unsigned char *) (*s_objet_argument_1).objet)) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; return; @@ -2291,7 +2297,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 +2309,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; @@ -2422,7 +2430,8 @@ instruction_wfproc(struct_processus *s_e } } - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2487,7 +2496,8 @@ instruction_wfproc(struct_processus *s_e profilage(s_etat_processus, NULL); } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2567,13 +2577,46 @@ 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_pile_processus)); + + 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)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_interruptions)) != 0) + { + pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)); + + 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_pile_processus)) != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2624,7 +2667,8 @@ instruction_wfproc(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_pile_processus)) != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2646,7 +2690,8 @@ instruction_wfproc(struct_processus *s_e profilage(s_etat_processus, NULL); } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2749,7 +2794,8 @@ instruction_wfdata(struct_processus *s_e } } - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2809,7 +2855,8 @@ instruction_wfdata(struct_processus *s_e profilage(s_etat_processus, NULL); } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -2852,7 +2899,8 @@ instruction_wfdata(struct_processus *s_e return; } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2893,7 +2941,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 +2954,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; @@ -2930,7 +2980,8 @@ instruction_wfdata(struct_processus *s_e return; } - if (pthread_mutex_lock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_lock(&((*s_etat_processus) + .mutex_pile_processus)) != 0) { if ((*s_etat_processus).profilage == d_vrai) { @@ -2957,7 +3008,8 @@ instruction_wfdata(struct_processus *s_e profilage(s_etat_processus, NULL); } - if (pthread_mutex_unlock(&((*s_etat_processus).mutex)) != 0) + if (pthread_mutex_unlock(&((*s_etat_processus).mutex_pile_processus)) + != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; @@ -3641,7 +3693,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 +3705,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 +3844,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 +3855,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 +3963,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 +3974,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;