--- rpl/src/analyse.c 2011/10/10 10:58:12 1.60 +++ rpl/src/analyse.c 2017/07/30 22:00:02 1.107 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.1.4 - Copyright (C) 1989-2011 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.27 + Copyright (C) 1989-2017 Dr. BERTRAND Joël This file is part of RPL/2. @@ -61,7 +61,7 @@ creation_instruction(struct_processus *s (*(*s_etat_processus).arbre_instructions).feuille = NULL; if (((*(*s_etat_processus).arbre_instructions).noeuds = - malloc((*s_etat_processus).nombre_caracteres + malloc(((size_t) (*s_etat_processus).nombre_caracteres) * sizeof(struct_instruction))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -101,7 +101,7 @@ creation_instruction(struct_processus *s if (((*(*l_instruction_courante).noeuds[(*s_etat_processus) .pointeurs_caracteres[*ptr]]).noeuds = - malloc((*s_etat_processus).nombre_caracteres + malloc(((size_t) (*s_etat_processus).nombre_caracteres) * sizeof(struct_instruction))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -180,7 +180,7 @@ initialisation_instructions(struct_proce } if (((*s_etat_processus).pointeurs_caracteres = - malloc(longueur_tableau * sizeof(int))) == NULL) + malloc(((size_t) longueur_tableau * sizeof(int)))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; return; @@ -323,6 +323,7 @@ initialisation_instructions(struct_proce INSTRUCTION("EGV", instruction_egv); INSTRUCTION("END", instruction_end); INSTRUCTION("ENG", instruction_eng); + INSTRUCTION("EQV", instruction_eqv); INSTRUCTION("EXP", instruction_exp); INSTRUCTION("FC?", instruction_fc_test); INSTRUCTION("FFT", instruction_fft); @@ -487,6 +488,7 @@ initialisation_instructions(struct_proce INSTRUCTION("PMAX", instruction_pmax); INSTRUCTION("PMIN", instruction_pmin); INSTRUCTION("POKE", instruction_poke); + INSTRUCTION("POLL", instruction_poll); INSTRUCTION("PPAR", instruction_ppar); INSTRUCTION("PRMD", instruction_prmd); INSTRUCTION("PRST", instruction_prst); @@ -512,6 +514,8 @@ initialisation_instructions(struct_proce INSTRUCTION("RECV", instruction_recv); INSTRUCTION("REGV", instruction_regv); INSTRUCTION("REPL", instruction_repl); + INSTRUCTION("RGDL", instruction_rgdl); + INSTRUCTION("RGDR", instruction_rgdr); INSTRUCTION("RNRM", instruction_rnrm); INSTRUCTION("ROLL", instruction_roll); //INSTRUCTION("ROOT") @@ -676,6 +680,7 @@ initialisation_instructions(struct_proce INSTRUCTION("PSDEV", instruction_psdev); INSTRUCTION("PURGE", instruction_purge); INSTRUCTION("RDATE", instruction_rdate); + INSTRUCTION("REGEX", instruction_regex); INSTRUCTION("RELAX", instruction_relax); INSTRUCTION("RFUSE", instruction_rfuse); INSTRUCTION("RSTOP", instruction_rstop); @@ -720,6 +725,7 @@ initialisation_instructions(struct_proce INSTRUCTION("ATEXIT", instruction_atexit); INSTRUCTION("ATPOKE", instruction_atpoke); INSTRUCTION("BESSEL", instruction_bessel); + INSTRUCTION("CIPHER", instruction_cipher); INSTRUCTION("CLRERR", instruction_clrerr); INSTRUCTION("CLRMTX", instruction_clrmtx); INSTRUCTION("CLRSWI", instruction_clrswi); @@ -744,6 +750,7 @@ initialisation_instructions(struct_proce INSTRUCTION("DETACH", instruction_spawn); # endif INSTRUCTION("DIAG->", instruction_diag_fleche); + INSTRUCTION("DIGEST", instruction_digest); //INSTRUCTION("DOLIST") //Instruction HP48 (application d'une fonction à une liste) //liste(s) nombre_de_listes_a_traiter fonction DOLIST @@ -755,6 +762,7 @@ initialisation_instructions(struct_proce //DOLIST //=> { 29 42 57 } INSTRUCTION("ELSEIF", instruction_elseif); + INSTRUCTION("FORALL", instruction_forall); INSTRUCTION("FORMAT", instruction_format); //INSTRUCTION("HEIGHT") INSTRUCTION("ITRACE", instruction_itrace); @@ -823,6 +831,7 @@ initialisation_instructions(struct_proce INSTRUCTION("PROTECT", instruction_protect); INSTRUCTION("PSHPRFL", instruction_pshprfl); INSTRUCTION("PULPRFL", instruction_pulprfl); + INSTRUCTION("RESTART", instruction_restart); INSTRUCTION("REVLIST", instruction_revlist); INSTRUCTION("SCATTER", instruction_scatter); INSTRUCTION("SUSPEND", instruction_suspend); @@ -836,7 +845,9 @@ initialisation_instructions(struct_proce INSTRUCTION("CLRCNTXT", instruction_clrcntxt); INSTRUCTION("CLRSMPHR", instruction_clrsmphr); + INSTRUCTION("COMPRESS", instruction_compress); INSTRUCTION("CONTINUE", instruction_continue); + INSTRUCTION("CRITICAL", instruction_critical); INSTRUCTION("DUPCNTXT", instruction_dupcntxt); INSTRUCTION("FUNCTION", instruction_function); INSTRUCTION("IMPLICIT", instruction_implicit); @@ -894,6 +905,7 @@ initialisation_instructions(struct_proce //pentes //représentent la valeur de la fonction (x,y) en leur milieu. //=> utile pour y'=F(x,y) + INSTRUCTION("UNCOMPRESS", instruction_uncompress); INSTRUCTION("LOCALIZATION", instruction_localization); INSTRUCTION("SMPHRTRYDECR", instruction_smphrtrydecr); @@ -955,8 +967,6 @@ analyse_instruction(struct_processus *s_ void analyse(struct_processus *s_etat_processus, void (*fonction)()) { - static logical1 initialisation = d_faux; - real8 attente; real8 pourcentage; real8 temps_cpu; @@ -965,8 +975,13 @@ analyse(struct_processus *s_etat_process static struct timeval horodatage_initial; struct timeval horodatage_final; +# ifndef OS2 static struct rusage usage_initial; struct rusage usage_final; +# else + static clock_t usage_initial; + clock_t usage_final; +# endif struct timespec temporisation; @@ -1013,6 +1028,22 @@ analyse(struct_processus *s_etat_process } } + /* + * Verrou pour les sections_critiques + */ + + if (pthread_mutex_lock(&mutex_sections_critiques) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + + if (pthread_mutex_unlock(&mutex_sections_critiques) != 0) + { + (*s_etat_processus).erreur_systeme = d_es_processus; + return; + } + scrutation_injection(s_etat_processus); if (fonction == NULL) @@ -1075,8 +1106,8 @@ analyse(struct_processus *s_etat_process if ((position = index((*s_etat_processus).instruction_courante, '$')) != NULL) { - if ((bibliotheque_candidate = malloc((position + 1 - - (*s_etat_processus).instruction_courante) + if ((bibliotheque_candidate = malloc(((size_t) (position + 1 + - (*s_etat_processus).instruction_courante)) * sizeof(unsigned char))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -1085,8 +1116,8 @@ analyse(struct_processus *s_etat_process (*bibliotheque_candidate) = d_code_fin_chaine; strncat(bibliotheque_candidate, - (*s_etat_processus).instruction_courante, - position - (*s_etat_processus).instruction_courante); + (*s_etat_processus).instruction_courante, ((size_t) + (position - (*s_etat_processus).instruction_courante))); position++; @@ -1131,9 +1162,23 @@ analyse(struct_processus *s_etat_process { if ((*s_etat_processus).test_instruction == 'N') { - if ((*s_etat_processus).nombre_interruptions_non_affectees != 0) + if (pthread_mutex_lock(&(*s_etat_processus).mutex_interruptions) + != 0) { - affectation_interruptions_logicielles(s_etat_processus); + (*s_etat_processus).erreur_systeme = d_es_processus; + } + else + { + 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; + } } if (((*s_etat_processus).nombre_interruptions_en_queue != 0) && @@ -1156,21 +1201,29 @@ analyse(struct_processus *s_etat_process -------------------------------------------------------------------------------- */ -# ifndef OS2 if ((*s_etat_processus).pourcentage_maximal_cpu < 100) { +# ifndef OS2 getrusage(RUSAGE_SELF, &usage_final); +# else + usage_final = clock(); +# endif + gettimeofday(&horodatage_final, NULL); - if (initialisation == d_vrai) + if ((*s_etat_processus).initialisation_scheduler == d_vrai) { temps_reel = ((real8) (horodatage_final.tv_sec - horodatage_initial.tv_sec)) + (((real8) (horodatage_final.tv_usec - horodatage_initial.tv_usec)) / ((real8) 1E6)); + // Le temps depuis la dernière limitation est de plus de un + // dixième de seconde. + if (temps_reel >= 0.1) { +# ifndef OS2 temps_cpu = ((real8) ((usage_final.ru_utime.tv_sec + usage_final.ru_stime.tv_sec) - (usage_initial.ru_utime.tv_sec + @@ -1179,6 +1232,9 @@ analyse(struct_processus *s_etat_process usage_final.ru_stime.tv_usec) - (usage_initial.ru_utime.tv_usec + usage_initial.ru_stime.tv_usec))) / ((real8) 1E6)); +# else + temps_cpu = (usage_final - usage_initial) / CLOCKS_PER_SEC; +# endif pourcentage = 100 * temps_cpu / temps_reel; @@ -1193,11 +1249,17 @@ analyse(struct_processus *s_etat_process (*s_etat_processus).pourcentage_maximal_cpu) - (pourcentage * temps_cpu / 100); - temporisation.tv_sec = floor(attente); - temporisation.tv_nsec = (attente - temporisation.tv_sec) * - 1E9; - - nanosleep(&temporisation, NULL); + temporisation.tv_sec = (time_t) floor(attente); + temporisation.tv_nsec = (suseconds_t) ((attente + - ((real8) temporisation.tv_sec)) * 1E9); + + while(nanosleep(&temporisation, &temporisation) == -1) + { + if (errno != EINTR) + { + break; + } + } } horodatage_initial = horodatage_final; @@ -1206,13 +1268,16 @@ analyse(struct_processus *s_etat_process } else { - initialisation = d_vrai; + (*s_etat_processus).initialisation_scheduler = d_vrai; horodatage_initial = horodatage_final; usage_initial = usage_final; } } -# endif + else + { + (*s_etat_processus).initialisation_scheduler = d_faux; + } /* --------------------------------------------------------------------------------