--- rpl/src/instructions_a5.c 2013/02/27 17:11:41 1.42 +++ rpl/src/instructions_a5.c 2022/10/02 08:01:20 1.75 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.13 - Copyright (C) 1989-2013 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.34 + Copyright (C) 1989-2021 Dr. BERTRAND Joël This file is part of RPL/2. @@ -43,14 +43,14 @@ instruction_alarm(struct_processus *s_et int code_retour; int erreur; + integer8 nombre_elements; + logical1 specification_date; struct_liste_chainee *l_element_courant; struct_objet *s_objet_argument; - struct timeb st; - struct timespec attente; struct timeval debut_interruption; @@ -62,8 +62,7 @@ instruction_alarm(struct_processus *s_et struct tm s_time_registre; time_t alarme; - - unsigned long nombre_elements; + time_t st; (*s_etat_processus).erreur_execution = d_ex; @@ -149,14 +148,14 @@ instruction_alarm(struct_processus *s_et return; } - st.time = time(NULL); - s_time_actuel = localtime(&(st.time)); + st = time(NULL); + s_time_actuel = localtime(&st); l_element_courant = (*s_objet_argument).objet; - s_time_alarme.tm_hour = (*((integer8 *) (*(*l_element_courant) + s_time_alarme.tm_hour = (int) (*((integer8 *) (*(*l_element_courant) .donnee).objet)); l_element_courant = (*l_element_courant).suivant; - s_time_alarme.tm_min = (*((integer8 *) (*(*l_element_courant) + s_time_alarme.tm_min = (int) (*((integer8 *) (*(*l_element_courant) .donnee).objet)); l_element_courant = (*l_element_courant).suivant; @@ -164,7 +163,7 @@ instruction_alarm(struct_processus *s_et if (l_element_courant != NULL) { - s_time_alarme.tm_sec = (*((integer8 *) (*(*l_element_courant) + s_time_alarme.tm_sec = (int) (*((integer8 *) (*(*l_element_courant) .donnee).objet)); l_element_courant = (*l_element_courant).suivant; @@ -172,21 +171,21 @@ instruction_alarm(struct_processus *s_et { specification_date = d_vrai; - s_time_alarme.tm_mday = (*((integer8 *) (*(*l_element_courant) - .donnee).objet)); + s_time_alarme.tm_mday = (int) (*((integer8 *) + (*(*l_element_courant).donnee).objet)); l_element_courant = (*l_element_courant).suivant; if (l_element_courant != NULL) { - s_time_alarme.tm_mon = (*((integer8 *) - (*(*l_element_courant).donnee).objet)) - 1; + s_time_alarme.tm_mon = (int) ((*((integer8 *) + (*(*l_element_courant).donnee).objet)) - 1); l_element_courant = (*l_element_courant).suivant; if (l_element_courant != NULL) { - s_time_alarme.tm_year = (*((integer8 *) + s_time_alarme.tm_year = (int) ((*((integer8 *) (*(*l_element_courant).donnee).objet)) - - 1900; + - 1900); l_element_courant = (*l_element_courant).suivant; } else @@ -215,7 +214,7 @@ instruction_alarm(struct_processus *s_et s_time_alarme.tm_year = (*s_time_actuel).tm_year; } - s_time_alarme.tm_isdst = 0; + s_time_alarme.tm_isdst = -1; s_time_registre = s_time_alarme; alarme = mktime(&s_time_alarme); @@ -233,7 +232,7 @@ instruction_alarm(struct_processus *s_et return; } - while((duree = difftime(alarme, st.time)) < 0) + while((duree = difftime(alarme, st)) < 0) { if (specification_date == d_vrai) { @@ -248,8 +247,8 @@ instruction_alarm(struct_processus *s_et alarme = mktime(&s_time_alarme); } - attente.tv_nsec = (long) ((duree - (attente.tv_sec = - (long) floor(duree))) * 1000000000); + attente.tv_nsec = (long) ((duree - (double) (attente.tv_sec = + (time_t) floor(duree))) * 1000000000); if ((*s_etat_processus).profilage == d_vrai) { @@ -272,11 +271,25 @@ instruction_alarm(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) { traitement_interruptions_logicielles(s_etat_processus);