X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b22de59cef475b7e699bd17f8e5ee19806994ce5..f25af1e2829458e33a3a0b74c75865c89dff5f9e:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index deebe97e80..41347b7313 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -9,6 +8,7 @@ #include "surf_private.h" #include "xbt/module.h" +#include "mc/mc.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, #define MAX_DRIVE 26 #endif -#ifdef _WIN32 +#ifdef _XBT_WIN32 #include static const char *disk_drives_letter_table[MAX_DRIVE] = { "A:\\", @@ -49,7 +49,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { "Y:\\", "Z:\\" }; -#endif /* #ifdef _WIN32 */ +#endif /* #ifdef _XBT_WIN32 */ /* * Returns the initial path. On Windows the initial path is @@ -61,7 +61,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { const char *__surf_get_initial_path(void) { -#ifdef _WIN32 +#ifdef _XBT_WIN32 unsigned i; char current_directory[MAX_PATH + 1] = { 0 }; unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); @@ -89,7 +89,7 @@ const char *__surf_get_initial_path(void) */ int __surf_is_absolute_file_path(const char *file_path) { -#ifdef _WIN32 +#ifdef _XBT_WIN32 WIN32_FIND_DATA wfd = { 0 }; HANDLE hFile = FindFirstFile(file_path, &wfd); @@ -103,7 +103,7 @@ int __surf_is_absolute_file_path(const char *file_path) #endif } -static double NOW = 0; +double NOW = 0; xbt_dynar_t model_list = NULL; tmgr_history_t history = NULL; @@ -112,29 +112,60 @@ 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}, + {"LV08_im", + "Realistic network model with IMPROVED ACTION MANAGEMENT and these correction factors: latency*=10.4, bandwidth*=.92, S=8775", + NULL, im_surf_network_model_init_LegrandVelho}, + {"SMPI", + "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)", + NULL, surf_network_model_init_SMPI}, #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 +175,16 @@ 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) { @@ -157,12 +198,13 @@ int find_model_description(s_surf_model_description_t * table, name_list = strdup(table[0].name); for (i = 1; table[i].name; i++) { name_list = - xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 2); + xbt_realloc(name_list, + strlen(name_list) + strlen(table[i].name) + 2); strcat(name_list, ", "); strcat(name_list, table[i].name); } - xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name, - name_list); + xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); + return -1; } double generic_maxmin_share_resources(xbt_swag_t running_actions, @@ -199,7 +241,8 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, for (action = xbt_swag_getNext(action, running_actions->offset); - action; action = xbt_swag_getNext(action, running_actions->offset)) { + action; + action = xbt_swag_getNext(action, running_actions->offset)) { value = lmm_variable_getvalue(VARIABLE(action)); if (value > 0) { if (action->remains > 0) @@ -208,21 +251,20 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, value = 0.0; if (value < min) { min = value; - DEBUG2("Updating min (value) with %p: %f", action, min); + XBT_DEBUG("Updating min (value) with %p: %f", action, min); } } if ((action->max_duration >= 0) && (action->max_duration < min)) { min = action->max_duration; - DEBUG2("Updating min (duration) with %p: %f", action, min); + XBT_DEBUG("Updating min (duration) with %p: %f", action, min); } } - DEBUG1("min value : %f", min); + XBT_DEBUG("min value : %f", min); #undef VARIABLE return min; } - XBT_LOG_EXTERNAL_CATEGORY(surf_cpu); XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange); @@ -234,8 +276,7 @@ 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); - +XBT_LOG_EXTERNAL_CATEGORY(surf_route); #ifdef HAVE_GTNETS XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets); @@ -255,7 +296,7 @@ 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); + XBT_LOG_CONNECT(surf_route, surf); #ifdef HAVE_GTNETS XBT_LOG_CONNECT(surf_network_gtnets, surf); @@ -268,12 +309,15 @@ void surf_init(int *argc, char **argv) history = tmgr_history_new(); surf_config_init(argc, argv); + surf_action_init(); + if (MC_IS_ENABLED) + MC_memory_init(); } -#ifdef WIN32 +#ifdef _XBT_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 +329,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); @@ -308,7 +352,7 @@ void surf_exit(void) surf_config_finalize(); xbt_dynar_foreach(model_list, iter, model) - model->model_private->finalize(); + model->model_private->finalize(); xbt_dynar_free(&model_list); if (maxmin_system) { @@ -319,6 +363,7 @@ void surf_exit(void) tmgr_history_free(history); history = NULL; } + surf_action_exit(); if (surf_path) xbt_dynar_free(&surf_path); @@ -326,9 +371,7 @@ void surf_exit(void) tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks(); - xbt_dict_free(&route_table); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ - xbt_exit(); } void surf_presolve(void) @@ -340,26 +383,27 @@ void surf_presolve(void) surf_model_t model = NULL; unsigned int iter; - DEBUG0 - ("First Run! Let's \"purge\" events and put models in the right state"); + XBT_DEBUG + ("First Run! Let's \"purge\" events and put models in the right state"); while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { if (next_event_date > NOW) break; while ((event = tmgr_history_get_next_event_leq(history, next_event_date, - &value, (void **) &resource))) { + &value, + (void **) &resource))) { resource->model->model_private->update_resource_state(resource, event, value, NOW); } } xbt_dynar_foreach(model_list, iter, model) - model->model_private->update_actions_state(NOW, 0.0); + model->model_private->update_actions_state(NOW, 0.0); } -double surf_solve(void) +double surf_solve(double max_date) { - double min = -1.0; + double min = -1.0; /* duration */ double next_event_date = -1.0; double model_next_action_end = -1.0; double value = -1.0; @@ -368,56 +412,70 @@ double surf_solve(void) tmgr_trace_event_t event = NULL; unsigned int iter; - min = -1.0; + if (max_date != -1.0 && max_date != NOW) { + min = max_date - NOW; + } - DEBUG0("Looking for next action end"); + XBT_DEBUG("Looking for next action end"); xbt_dynar_foreach(model_list, iter, model) { - DEBUG1("Running for Resource [%s]", model->name); + XBT_DEBUG("Running for Resource [%s]", model->name); model_next_action_end = model->model_private->share_resources(NOW); - DEBUG2("Resource [%s] : next action end = %f", + XBT_DEBUG("Resource [%s] : next action end = %f", model->name, model_next_action_end); if (((min < 0.0) || (model_next_action_end < min)) && (model_next_action_end >= 0.0)) min = model_next_action_end; } - DEBUG1("Next action end : %f", min); + XBT_DEBUG("Next action end : %f", min); - if (min < 0.0) - return -1.0; - - DEBUG0("Looking for next event"); + XBT_DEBUG("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) + XBT_DEBUG("Next TRACE event : %f", next_event_date); + if ((min != -1.0) && (next_event_date > NOW + min)) break; - DEBUG0("Updating models"); + XBT_DEBUG("Updating models"); while ((event = tmgr_history_get_next_event_leq(history, next_event_date, - &value, (void **) &resource))) { + &value, + (void **) &resource))) { if (resource->model->model_private->resource_used(resource)) { min = next_event_date - NOW; - DEBUG1 - ("This event will modify model state. Next event set to %f", min); + XBT_DEBUG + ("This event will modify model state. Next event set to %f", + min); } /* update state of model_obj according to new value. Does not touch lmm. It will be modified if needed when updating actions */ + XBT_DEBUG("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); } } - DEBUG1("Duration set to %f", 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; + + XBT_DEBUG("Duration set to %f", min); NOW = NOW + min; xbt_dynar_foreach(model_list, iter, model) - model->model_private->update_actions_state(NOW, min); + model->model_private->update_actions_state(NOW, min); + +#ifdef HAVE_TRACING + TRACE_paje_dump_buffer (0); +#endif return min; } -double surf_get_clock(void) +XBT_INLINE double surf_get_clock(void) { return NOW; }