--- rpl/src/analyse.c 2011/01/03 12:08:02 1.35 +++ rpl/src/analyse.c 2022/09/07 13:40:29 1.118 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.20 - Copyright (C) 1989-2011 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. @@ -35,7 +35,6 @@ ================================================================================ */ - static void creation_instruction(struct_processus *s_etat_processus, unsigned char *instruction, void (*routine)()) @@ -61,8 +60,8 @@ creation_instruction(struct_processus *s (*(*s_etat_processus).arbre_instructions).feuille = NULL; - if (((*(*s_etat_processus).arbre_instructions).noeud = - malloc((*s_etat_processus).nombre_caracteres + if (((*(*s_etat_processus).arbre_instructions).noeuds = + malloc(((size_t) (*s_etat_processus).nombre_caracteres) * sizeof(struct_instruction))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -71,7 +70,7 @@ creation_instruction(struct_processus *s for(i = 0; i < (*s_etat_processus).nombre_caracteres; i++) { - (*(*s_etat_processus).arbre_instructions).noeud[i] = NULL; + (*(*s_etat_processus).arbre_instructions).noeuds[i] = NULL; } } @@ -84,12 +83,12 @@ creation_instruction(struct_processus *s printf("Instruction=\"%s\", (*ptr)='%c'\n", instruction, *ptr)); - if ((*l_instruction_courante).noeud[(*s_etat_processus) + if ((*l_instruction_courante).noeuds[(*s_etat_processus) .pointeurs_caracteres[*ptr]] == NULL) { // Le noeud suivant n'existe pas, on le crée. - if (((*l_instruction_courante).noeud[(*s_etat_processus) + if (((*l_instruction_courante).noeuds[(*s_etat_processus) .pointeurs_caracteres[*ptr]] = malloc(sizeof(struct_instruction))) == NULL) { @@ -97,12 +96,12 @@ creation_instruction(struct_processus *s return; } - (*(*l_instruction_courante).noeud[(*s_etat_processus) + (*(*l_instruction_courante).noeuds[(*s_etat_processus) .pointeurs_caracteres[*ptr]]).feuille = NULL; - if (((*(*l_instruction_courante).noeud[(*s_etat_processus) - .pointeurs_caracteres[*ptr]]).noeud = - malloc((*s_etat_processus).nombre_caracteres + if (((*(*l_instruction_courante).noeuds[(*s_etat_processus) + .pointeurs_caracteres[*ptr]]).noeuds = + malloc(((size_t) (*s_etat_processus).nombre_caracteres) * sizeof(struct_instruction))) == NULL) { (*s_etat_processus).erreur_systeme = d_es_allocation_memoire; @@ -111,12 +110,12 @@ creation_instruction(struct_processus *s for(i = 0; i < (*s_etat_processus).nombre_caracteres; i++) { - (*(*l_instruction_courante).noeud[(*s_etat_processus) - .pointeurs_caracteres[*ptr]]).noeud[i] = NULL; + (*(*l_instruction_courante).noeuds[(*s_etat_processus) + .pointeurs_caracteres[*ptr]]).noeuds[i] = NULL; } } - l_instruction_courante = (*l_instruction_courante).noeud + l_instruction_courante = (*l_instruction_courante).noeuds [(*s_etat_processus).pointeurs_caracteres[*ptr]]; ptr++; } @@ -138,13 +137,13 @@ liberation_arbre_instructions(struct_pro for(i = 0; i < (*s_etat_processus).nombre_caracteres; i++) { - if ((*arbre).noeud[i] != NULL) + if ((*arbre).noeuds[i] != NULL) { - liberation_arbre_instructions(s_etat_processus, (*arbre).noeud[i]); + liberation_arbre_instructions(s_etat_processus, (*arbre).noeuds[i]); } } - free((*arbre).noeud); + free((*arbre).noeuds); free(arbre); return; @@ -181,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; @@ -324,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); @@ -459,15 +459,14 @@ initialisation_instructions(struct_proce INSTRUCTION("INCR", instruction_incr); //INSTRUCTION("ISOL"); INSTRUCTION("ISWI", instruction_iswi); -# ifndef OS2 INSTRUCTION("KILL", instruction_kill); -# endif INSTRUCTION("KIND", instruction_kind); INSTRUCTION("LAST", instruction_last); INSTRUCTION("LEGV", instruction_legv); INSTRUCTION("LINE", instruction_line); INSTRUCTION("LNP1", instruction_lnp1); INSTRUCTION("LOCK", instruction_lock); + INSTRUCTION("L->T", instruction_l_vers_t); INSTRUCTION("MANT", instruction_mant); INSTRUCTION("MARK", instruction_mark); //INSTRUCTION("MAXR") @@ -488,9 +487,8 @@ initialisation_instructions(struct_proce INSTRUCTION("PLOT", instruction_plot); INSTRUCTION("PMAX", instruction_pmax); INSTRUCTION("PMIN", instruction_pmin); -# ifndef OS2 INSTRUCTION("POKE", instruction_poke); -# endif + INSTRUCTION("POLL", instruction_poll); INSTRUCTION("PPAR", instruction_ppar); INSTRUCTION("PRMD", instruction_prmd); INSTRUCTION("PRST", instruction_prst); @@ -516,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") @@ -544,6 +544,7 @@ initialisation_instructions(struct_proce INSTRUCTION("SPAR", instruction_spar); INSTRUCTION("SQRT", instruction_sqrt); //INSTRUCTION("SRAD"); + INSTRUCTION("SREV", instruction_srev); //INSTRUCTION("SRNM") //Instruction HP48 (renvoie la norme spectrale d'un tableau. Pour une //matrice, @@ -556,9 +557,7 @@ initialisation_instructions(struct_proce INSTRUCTION("STO-", instruction_sto_moins); INSTRUCTION("STO/", instruction_sto_division); INSTRUCTION("STOF", instruction_stof); -# ifndef OS2 INSTRUCTION("STOP", instruction_stop); -# endif INSTRUCTION("STOS", instruction_stos); INSTRUCTION("STWS", instruction_stws); INSTRUCTION("SWAP", instruction_swap); @@ -571,6 +570,7 @@ initialisation_instructions(struct_proce INSTRUCTION("TRNC", instruction_trnc); INSTRUCTION("TRUE", instruction_true); INSTRUCTION("TYPE", instruction_type); + INSTRUCTION("T->L", instruction_t_vers_l); INSTRUCTION("UTPC", instruction_utpc); INSTRUCTION("UTPF", instruction_utpf); INSTRUCTION("UTPN", instruction_utpn); @@ -651,6 +651,7 @@ initialisation_instructions(struct_proce INSTRUCTION("LCASE", instruction_lcase); INSTRUCTION("LCHOL", instruction_lchol); INSTRUCTION("LCD->", instruction_lcd_fleche); + INSTRUCTION("LIMIT", instruction_limit); //INSTRUCTION("NDIST") //Instruction HP48 (distribution normale, prend la moyenne au niveau 3, //la variance au niveau 2, un réel x au niveau 1 et renvoie la probabilité @@ -679,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); @@ -691,9 +693,7 @@ initialisation_instructions(struct_proce INSTRUCTION("SLICE", instruction_slice); //INSTRUCTION("SLIST") //Instruction HP48 (somme des termes d'une liste) -# ifndef OS2 INSTRUCTION("SPAWN", instruction_spawn); -# endif INSTRUCTION("START", instruction_start); INSTRUCTION("STORE", instruction_store); INSTRUCTION("STR->", instruction_str_fleche); @@ -725,15 +725,32 @@ 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); INSTRUCTION("CREATE", instruction_create); INSTRUCTION("DELETE", instruction_delete); -# ifndef OS2 - INSTRUCTION("DETACH", instruction_detach); +# ifdef SHARED_MEMORY + INSTRUCTION("DETACH", instruction_detach); +# else + if ((*s_etat_processus).langue == 'F') + { + printf("+++Attention : DETACH est émulé par SPAWN car le système" + " hôte ne supporte\n" + " pas de mémoire partagée !\n"); + } + else + { + printf("+++Warning : DETACH is replaced by SPAWN as host system" + " does not support\n" + " shared memory !\n"); + } + + 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 @@ -745,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); @@ -757,6 +775,7 @@ initialisation_instructions(struct_proce INSTRUCTION("RCLSWI", instruction_rclswi); INSTRUCTION("RECALL", instruction_recall); INSTRUCTION("RECODE", instruction_recode); + INSTRUCTION("RECORD", instruction_record); INSTRUCTION("REDRAW", instruction_redraw); INSTRUCTION("REMOVE", instruction_remove); INSTRUCTION("REPEAT", instruction_repeat); @@ -807,12 +826,14 @@ initialisation_instructions(struct_proce INSTRUCTION("INQUIRE", instruction_inquire); INSTRUCTION("MEMLOCK", instruction_memlock); INSTRUCTION("MTXLOCK", instruction_mtxlock); + INSTRUCTION("NBRCPUS", instruction_nbrcpus); INSTRUCTION("PERSIST", instruction_persist); INSTRUCTION("PLOTTER", instruction_plotter); INSTRUCTION("PRIVATE", instruction_private); 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); @@ -826,12 +847,13 @@ initialisation_instructions(struct_proce INSTRUCTION("CLRCNTXT", instruction_clrcntxt); INSTRUCTION("CLRSMPHR", instruction_clrsmphr); -# ifndef OS2 + INSTRUCTION("COMPRESS", instruction_compress); INSTRUCTION("CONTINUE", instruction_continue); -# endif + INSTRUCTION("CRITICAL", instruction_critical); INSTRUCTION("DUPCNTXT", instruction_dupcntxt); INSTRUCTION("FUNCTION", instruction_function); INSTRUCTION("IMPLICIT", instruction_implicit); + INSTRUCTION("INFINITY", instruction_sensible_infinity); INSTRUCTION("KEYLABEL", instruction_keylabel); INSTRUCTION("KEYTITLE", instruction_keytitle); INSTRUCTION("LOGSCALE", instruction_logscale); @@ -885,6 +907,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); @@ -916,14 +939,14 @@ analyse_instruction(struct_processus *s_ return(NULL); } - if ((*l_instruction_courante).noeud[pointeur] == NULL) + if ((*l_instruction_courante).noeuds[pointeur] == NULL) { // Le chemin de l'instruction candidate n'existe pas. return(NULL); } - l_instruction_courante = (*l_instruction_courante).noeud[pointeur]; + l_instruction_courante = (*l_instruction_courante).noeuds[pointeur]; ptr++; if ((l_instruction_courante == NULL) && ((*ptr) != d_code_fin_chaine)) @@ -946,8 +969,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; @@ -956,8 +977,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; @@ -969,11 +995,6 @@ analyse(struct_processus *s_etat_process void (*instruction)(); -# ifdef DMALLOC - BUG(dmalloc_verify(NULL) == DMALLOC_VERIFY_ERROR, - printf("HEAP CORRUPTION!")); -# endif - errno = 0; (*s_etat_processus).var_volatile_exception_gsl = 0; @@ -987,13 +1008,20 @@ analyse(struct_processus *s_etat_process */ # ifndef SEMAPHORES_NOMMES - if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0) + if (sem_post(&((*s_etat_processus).semaphore_fork)) != 0) +# else + if (sem_post((*s_etat_processus).semaphore_fork) != 0) +# endif { (*s_etat_processus).erreur_systeme = d_es_processus; return; } - while(sem_wait(&((*s_etat_processus).semaphore_fork)) == -1) +# ifndef SEMAPHORES_NOMMES + while(sem_wait(&((*s_etat_processus).semaphore_fork)) != 0) +# else + while(sem_wait((*s_etat_processus).semaphore_fork) != 0) +# endif { if (errno != EINTR) { @@ -1001,22 +1029,22 @@ analyse(struct_processus *s_etat_process return; } } -# else - if (sem_post((*s_etat_processus).semaphore_fork) != 0) + + /* + * Verrou pour les sections_critiques + */ + + if (pthread_mutex_lock(&mutex_sections_critiques) != 0) { (*s_etat_processus).erreur_systeme = d_es_processus; return; } - while(sem_wait((*s_etat_processus).semaphore_fork) == -1) + if (pthread_mutex_unlock(&mutex_sections_critiques) != 0) { - if (errno != EINTR) - { - (*s_etat_processus).erreur_systeme = d_es_processus; - return; - } + (*s_etat_processus).erreur_systeme = d_es_processus; + return; } -# endif scrutation_injection(s_etat_processus); @@ -1080,8 +1108,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; @@ -1090,8 +1118,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++; @@ -1136,9 +1164,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) && @@ -1161,21 +1203,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 + @@ -1184,6 +1234,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; @@ -1198,11 +1251,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; @@ -1211,13 +1270,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; + } /* --------------------------------------------------------------------------------