X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b22de59cef475b7e699bd17f8e5ee19806994ce5..a182030b5a8c0db05a1de18ca230b61e76363ebc:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index deebe97e80..dec52bf82e 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -112,29 +112,30 @@ xbt_dynar_t surf_path = NULL; /* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"Constant", NULL, surf_network_model_init_Constant}, - {"CM02", NULL, surf_network_model_init_CM02}, - {"LegrandVelho", NULL, surf_network_model_init_LegrandVelho}, + {"Constant", "Simplistic network model where all communication take a constant time (one second)", NULL, surf_network_model_init_Constant}, + {"CM02", "Realistic network model with lmm_solve and no correction factors", NULL, surf_network_model_init_CM02}, + {"LV08", "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775" , NULL, surf_network_model_init_LegrandVelho}, #ifdef HAVE_GTNETS - {"GTNets", NULL, surf_network_model_init_GTNETS}, + {"GTNets", "Network Pseudo-model using the GTNets simulator instead of an analytic model", NULL, surf_network_model_init_GTNETS}, #endif - {"Reno", NULL, surf_network_model_init_Reno}, - {"Reno2", NULL, surf_network_model_init_Reno2}, - {"Vegas", NULL, surf_network_model_init_Vegas}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {"Reno", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Reno}, + {"Reno2", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Reno2}, + {"Vegas", "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, surf_network_model_init_Vegas}, + {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", NULL, surf_cpu_model_init_Cas01}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {"Cas01_fullupdate", "CPU classical model time=size/power", NULL, surf_cpu_model_init_Cas01}, + {"Cas01", "Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster", NULL, surf_cpu_model_init_Cas01_im}, + {"CpuTI", "Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces", NULL, surf_cpu_model_init_ti}, + {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_workstation_model_description[] = { - {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations}, - {"compound", NULL, surf_workstation_model_init_compound, - create_workstations}, - {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {"CLM03", "Default workstation model, using LV08 and CM02 as network and CPU", NULL, surf_workstation_model_init_CLM03, create_workstations}, + {"compound", "Workstation model allowing you to use other network and CPU models", NULL, surf_workstation_model_init_compound, create_workstations}, + {"ptask_L07", "Workstation model with better parallel task modeling", NULL, surf_workstation_model_init_ptask_L07, NULL}, + {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ }; void update_model_description(s_surf_model_description_t * table, @@ -144,6 +145,14 @@ void update_model_description(s_surf_model_description_t * table, table[i].model = model; } +/** Displays the long description of all registered models, and quit */ +void model_help(const char* category, s_surf_model_description_t * table) { + int i; + printf("Long description of the %s models accepted by this simulator:\n",category); + for (i = 0; table[i].name; i++) + printf(" %s: %s\n", table[i].name, table[i].description); +} + int find_model_description(s_surf_model_description_t * table, const char *name) { @@ -273,7 +282,7 @@ void surf_init(int *argc, char **argv) #ifdef WIN32 # define FILE_DELIM "\\" #else -# define FILE_DELIM "/" /* FIXME: move to better location */ +# define FILE_DELIM "/" /* FIXME: move to better location */ #endif FILE *surf_fopen(const char *name, const char *mode) @@ -285,12 +294,12 @@ FILE *surf_fopen(const char *name, const char *mode) xbt_assert(name); - if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */ + if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */ return fopen(name, mode); /* search relative files in the path */ xbt_dynar_foreach(surf_path, cpt, path_elm) { - buff = bprintf("%s" FILE_DELIM "%s", path_elm,name); + buff = bprintf("%s" FILE_DELIM "%s", path_elm, name); file = fopen(buff, mode); free(buff); @@ -382,13 +391,10 @@ double surf_solve(void) } DEBUG1("Next action end : %f", min); - if (min < 0.0) - return -1.0; - DEBUG0("Looking for next event"); while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { - DEBUG1("Next event : %f", next_event_date); - if (next_event_date > NOW + min) + DEBUG1("Next TRACE event : %f", next_event_date); + if ((min != -1.0) && (next_event_date > NOW + min)) break; DEBUG0("Updating models"); while ((event = @@ -401,12 +407,19 @@ double surf_solve(void) } /* update state of model_obj according to new value. Does not touch lmm. It will be modified if needed when updating actions */ - resource->model->model_private->update_resource_state(resource, - event, value, - NOW + min); + DEBUG2("Calling update_resource_state for resource %s with min %lf", + resource->model->name, min); + resource->model->model_private->update_resource_state(resource, event, + value, NOW + min); } } + /* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0. + * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0. + * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */ + if (min < 0.0) + return -1.0; + DEBUG1("Duration set to %f", min); NOW = NOW + min;