X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d5b327d0b5304bc0beaff6aae611dda6dac1b03..3fed8dfc00286ce4df0341262e278298df401b78:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 7ac373fcd4..85ad1560c6 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -13,9 +13,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); -int use_sdp_solver = 0; -int use_lagrange_solver = 0; - /* Additional declarations for Windows potability. */ #ifndef MAX_DRIVE @@ -117,12 +114,9 @@ xbt_dynar_t surf_path = NULL; 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}, + {"LV08", NULL, surf_network_model_init_LegrandVelho}, #ifdef HAVE_GTNETS {"GTNets", NULL, surf_network_model_init_GTNETS}, -#endif -#ifdef HAVE_SDP - {"SDP", NULL, surf_network_model_init_SDP}, #endif {"Reno", NULL, surf_network_model_init_Reno}, {"Reno2", NULL, surf_network_model_init_Reno2}, @@ -131,7 +125,9 @@ s_surf_model_description_t surf_network_model_description[] = { }; s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", NULL, surf_cpu_model_init_Cas01}, + {"Cas01_fullupdate", NULL, surf_cpu_model_init_Cas01}, + {"Cas01", NULL, surf_cpu_model_init_Cas01_im}, + {"CpuTI", NULL, surf_cpu_model_init_ti}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -240,12 +236,9 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_parse); XBT_LOG_EXTERNAL_CATEGORY(surf_timer); XBT_LOG_EXTERNAL_CATEGORY(surf_workstation); XBT_LOG_EXTERNAL_CATEGORY(surf_config); +XBT_LOG_EXTERNAL_CATEGORY(surf_routing); -#ifdef HAVE_SDP -XBT_LOG_EXTERNAL_CATEGORY(surf_sdp_out); -XBT_LOG_EXTERNAL_CATEGORY(surf_sdp); -#endif #ifdef HAVE_GTNETS XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets); #endif @@ -264,11 +257,8 @@ void surf_init(int *argc, char **argv) XBT_LOG_CONNECT(surf_timer, surf); XBT_LOG_CONNECT(surf_workstation, surf); XBT_LOG_CONNECT(surf_config, surf); + XBT_LOG_CONNECT(surf_routing, surf); -#ifdef HAVE_SDP - XBT_LOG_CONNECT(surf_sdp_out, surf); - XBT_LOG_CONNECT(surf_sdp, surf); -#endif #ifdef HAVE_GTNETS XBT_LOG_CONNECT(surf_network_gtnets, surf); #endif @@ -282,45 +272,34 @@ void surf_init(int *argc, char **argv) surf_config_init(argc, argv); } -static char *path_name = NULL; +#ifdef WIN32 +# define FILE_DELIM "\\" +#else +# define FILE_DELIM "/" /* FIXME: move to better location */ +#endif + FILE *surf_fopen(const char *name, const char *mode) { - unsigned int iter; - char *path = NULL; + unsigned int cpt; + char *path_elm = NULL; + char *buff; FILE *file = NULL; - unsigned int path_name_len = 0; /* don't count '\0' */ - xbt_assert0(name, "Need a non-NULL file name"); + xbt_assert(name); - xbt_assert0(surf_path, - "surf_init has to be called before using surf_fopen"); - - 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); - } else { /* search relative files in the path */ - - if (!path_name) { - path_name_len = strlen(name); - path_name = xbt_new0(char, path_name_len + 1); - } + /* search relative files in the path */ + xbt_dynar_foreach(surf_path, cpt, path_elm) { + buff = bprintf("%s" FILE_DELIM "%s", path_elm, name); + file = fopen(buff, mode); + free(buff); - xbt_dynar_foreach(surf_path, iter, path) { - if (path_name_len < strlen(path) + strlen(name) + 1) { - path_name_len = strlen(path) + strlen(name) + 1; /* plus '/' */ - path_name = xbt_realloc(path_name, path_name_len + 1); - } -#ifdef WIN32 - sprintf(path_name, "%s\\%s", path, name); -#else - sprintf(path_name, "%s/%s", path, name); -#endif - file = fopen(path_name, mode); - if (file) - return file; - } + if (file) + return file; } - return file; + return NULL; } void surf_exit(void) @@ -330,9 +309,9 @@ void surf_exit(void) surf_config_finalize(); - xbt_dynar_foreach(model_list, iter, model) { + xbt_dynar_foreach(model_list, iter, model) model->model_private->finalize(); - } + xbt_dynar_free(&model_list); if (maxmin_system) { lmm_system_free(maxmin_system); @@ -342,18 +321,12 @@ void surf_exit(void) tmgr_history_free(history); history = NULL; } - if (model_list) - xbt_dynar_free(&model_list); if (surf_path) xbt_dynar_free(&surf_path); tmgr_finalize(); surf_parse_lex_destroy(); - if (path_name) { - free(path_name); - path_name = NULL; - } surf_parse_free_callbacks(); xbt_dict_free(&route_table); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ @@ -382,9 +355,8 @@ void surf_presolve(void) NOW); } } - xbt_dynar_foreach(model_list, iter, model) { + xbt_dynar_foreach(model_list, iter, model) model->model_private->update_actions_state(NOW, 0.0); - } } double surf_solve(void) @@ -412,13 +384,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 = @@ -431,19 +400,25 @@ 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; - xbt_dynar_foreach(model_list, iter, model) { + xbt_dynar_foreach(model_list, iter, model) model->model_private->update_actions_state(NOW, min); - } return min; }