X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..f25af1e2829458e33a3a0b74c75865c89dff5f9e:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index a31ee9bb77..41347b7313 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -115,14 +115,15 @@ s_surf_model_description_t surf_network_model_description[] = { {"Constant", "Simplistic network model where all communication take a constant time (one second)", NULL, surf_network_model_init_Constant}, - {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas", - NULL, surf_network_model_init_Vivaldi}, {"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}, @@ -202,8 +203,8 @@ int find_model_description(s_surf_model_description_t * table, 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, @@ -250,15 +251,15 @@ 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; @@ -308,10 +309,9 @@ void surf_init(int *argc, char **argv) history = tmgr_history_new(); surf_config_init(argc, argv); -#ifdef HAVE_MC - if (_surf_do_model_check) + surf_action_init(); + if (MC_IS_ENABLED) MC_memory_init(); -#endif } #ifdef _XBT_WIN32 @@ -363,6 +363,7 @@ void surf_exit(void) tmgr_history_free(history); history = NULL; } + surf_action_exit(); if (surf_path) xbt_dynar_free(&surf_path); @@ -382,7 +383,7 @@ void surf_presolve(void) surf_model_t model = NULL; unsigned int iter; - DEBUG0 + 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) @@ -400,9 +401,9 @@ void surf_presolve(void) 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; @@ -411,39 +412,41 @@ 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); - DEBUG0("Looking for next event"); + XBT_DEBUG("Looking for next event"); while ((next_event_date = tmgr_history_next_date(history)) != -1.0) { - DEBUG1("Next TRACE event : %f", next_event_date); + 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))) { if (resource->model->model_private->resource_used(resource)) { min = next_event_date - NOW; - DEBUG1 + 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 */ - DEBUG2("Calling update_resource_state for resource %s with min %lf", + 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, @@ -451,23 +454,28 @@ double surf_solve(void) } } + /* 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); + 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); +#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; }