X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..0d3245b3e4f5440210358c5b7499379ee6aaa328:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index f80dadd0dd..22aeea5247 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -1,28 +1,30 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. 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. */ -#include - #include "surf_private.h" #include "xbt/module.h" +#include "mc/mc.h" +#include "simix/smx_host_private.h" +#include "surf/surf_resource.h" +#include "xbt/xbt_os_thread.h" +#include "simgrid/sg_config.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, - "Logging specific to SURF (kernel)"); +#include -int use_sdp_solver = 0; -int use_lagrange_solver = 0; +XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, + "Logging specific to SURF (kernel)"); -/* Additional declarations for Windows potability. */ +/* Additional declarations for Windows portability. */ #ifndef MAX_DRIVE #define MAX_DRIVE 26 #endif -#ifdef _WIN32 +#ifdef _XBT_WIN32 #include static const char *disk_drives_letter_table[MAX_DRIVE] = { "A:\\", @@ -52,7 +54,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 @@ -64,7 +66,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); @@ -92,7 +94,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); @@ -106,107 +108,152 @@ int __surf_is_absolute_file_path(const char *file_path) #endif } -typedef struct surf_model_object { - surf_model_t model; -} s_surf_model_object_t, *surf_model_object_t; - -static double NOW = 0; +double NOW = 0; xbt_dynar_t model_list = NULL; tmgr_history_t history = NULL; lmm_system_t maxmin_system = NULL; xbt_dynar_t surf_path = NULL; -const char *surf_action_state_names[6] = { - "SURF_ACTION_READY", - "SURF_ACTION_RUNNING", - "SURF_ACTION_FAILED", - "SURF_ACTION_DONE", - "SURF_ACTION_TO_FREE", - "SURF_ACTION_NOT_IN_THE_SYSTEM" -}; -int surf_network_model_description_size = 3 -#ifdef HAVE_GTNETS - + 1 -#endif -#ifdef HAVE_SDP - + 1 -#endif - ; +/* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"CM02", NULL, surf_network_model_init_CM02}, + {"LV08", + "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", + surf_network_model_init_LegrandVelho}, + {"Constant", + "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.", + surf_network_model_init_Constant}, + {"SMPI", + "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + surf_network_model_init_SMPI}, + {"CM02", + "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", + surf_network_model_init_CM02}, #ifdef HAVE_GTNETS - {"GTNets", NULL, surf_network_model_init_GTNETS}, + {"GTNets", + "Network pseudo-model using the GTNets simulator instead of an analytic model", + surf_network_model_init_GTNETS}, #endif -#ifdef HAVE_SDP - {"SDP", NULL, surf_network_model_init_SDP}, +#ifdef HAVE_NS3 + {"NS3", + "Network pseudo-model using the NS3 tcp model instead of an analytic model", + surf_network_model_init_NS3}, #endif - {"Reno", NULL, surf_network_model_init_Reno}, - {"Vegas", NULL, surf_network_model_init_Vegas} + {"Reno", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + surf_network_model_init_Reno}, + {"Reno2", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + surf_network_model_init_Reno2}, + {"Vegas", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + surf_network_model_init_Vegas}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -int surf_cpu_model_description_size = 1; s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", NULL, surf_cpu_model_init_Cas01}, + {"Cas01", + "Simplistic CPU model (time=size/power).", + surf_cpu_model_init_Cas01}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -int surf_workstation_model_description_size = 4; s_surf_model_description_t surf_workstation_model_description[] = { - {"CLM03", NULL, surf_workstation_model_init_CLM03}, - {"KCCFLN05", NULL, surf_workstation_model_init_KCCFLN05}, - {"compound", NULL, surf_workstation_model_init_compound}, - {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07} + {"default", + "Default workstation model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", + surf_workstation_model_init_current_default}, + {"compound", + "Workstation model that is automatically chosen if you change the network and CPU models", + surf_workstation_model_init_compound}, + {"ptask_L07", "Workstation model somehow similar to Cas01+CM02 but allowing parallel tasks", + surf_workstation_model_init_ptask_L07}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; + +s_surf_model_description_t surf_optimization_mode_description[] = { + {"Lazy", + "Lazy action management (partial invalidation in lmm + heap in action remaining).", + NULL}, + {"TI", + "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", + NULL}, + {"Full", + "Full update of remaining and variables. Slow but may be useful when debugging.", + NULL}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; + +s_surf_model_description_t surf_storage_model_description[] = { + {"default", + "Simplistic storage model.", + surf_storage_model_init_default}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -void update_model_description(s_surf_model_description_t * table, - int table_size, - const char *name, - surf_model_t model) +/* ********************************************************************* */ +/* TUTORIAL: New model */ +s_surf_model_description_t surf_new_model_description[] = { + {"default", + "Tutorial model.", + surf_new_model_init_default}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; +/* ********************************************************************* */ + +#ifdef CONTEXT_THREADS +static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ +#endif + +static int surf_nthreads = 1; /* number of threads of the parmap (1 means no parallelism) */ +static double *surf_mins = NULL; /* return value of share_resources for each model */ +static int surf_min_index; /* current index in surf_mins */ +static double min; /* duration determined by surf_solve */ + +static void surf_share_resources(surf_model_t model); +static void surf_update_actions_state(surf_model_t 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 = find_model_description(table, table_size, name); - table[i].model = model; + 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, - int table_size, const char *name) + const char *name) { int i; char *name_list = NULL; - for (i = 0; i < table_size; i++) + for (i = 0; table[i].name; i++) if (!strcmp(name, table[i].name)) { return i; } name_list = strdup(table[0].name); - for (i = 1; i < table_size; i++) { + 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) + 3); strcat(name_list, ", "); strcat(name_list, table[i].name); } - xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name, - name_list); -} - -double generic_maxmin_share_models(xbt_swag_t running_actions, - size_t offset) -{ - return generic_maxmin_share_models2(running_actions, offset, - maxmin_system, lmm_solve); + xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); + return -1; } -double generic_maxmin_share_models2(xbt_swag_t running_actions, - size_t offset, - lmm_system_t sys, - void (*solve) (lmm_system_t)) +double generic_maxmin_share_resources(xbt_swag_t running_actions, + size_t offset, + lmm_system_t sys, + void (*solve) (lmm_system_t)) { surf_action_t action = NULL; double min = -1; double value = -1; #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) - xbt_assert0(solve, "Give me a real solver function!"); solve(sys); xbt_swag_foreach(action, running_actions) { @@ -219,192 +266,206 @@ double generic_maxmin_share_models2(xbt_swag_t running_actions, return -1.0; if (value > 0) { - if(action->remains>0) + if (action->remains > 0) min = action->remains / value; - else + else min = 0.0; if ((action->max_duration >= 0) && (action->max_duration < min)) min = action->max_duration; } else min = action->max_duration; - DEBUG5("Found action (%p: duration = %f, remains = %f, value = %f) ! %f", - action, action->max_duration, action->remains, value, min); for (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) - value = action->remains / value; - else - value = 0.0; + if (action->remains > 0) + value = action->remains / value; + else + value = 0.0; if (value < min) { - min = value; - DEBUG2("Updating min (value) with %p: %f", action, min); + min = value; + 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; } -e_surf_action_state_t surf_action_get_state(surf_action_t action) +double generic_share_resources_lazy(double now, surf_model_t model) { - surf_action_state_t action_state = - &(action->model_type->common_public->states); - - if (action->state_set == action_state->ready_action_set) - return SURF_ACTION_READY; - if (action->state_set == action_state->running_action_set) - return SURF_ACTION_RUNNING; - if (action->state_set == action_state->failed_action_set) - return SURF_ACTION_FAILED; - if (action->state_set == action_state->done_action_set) - return SURF_ACTION_DONE; - return SURF_ACTION_NOT_IN_THE_SYSTEM; -} + surf_action_lmm_t action = NULL; + double min = -1; + double value; -double surf_action_get_start_time(surf_action_t action) -{ - return action->start; -} + XBT_DEBUG + ("Before share resources, the size of modified actions set is %d", + xbt_swag_size(model->model_private->modified_set)); -double surf_action_get_finish_time(surf_action_t action) -{ - return action->finish; -} + lmm_solve(model->model_private->maxmin_system); -void surf_action_free(surf_action_t * action) -{ - (*action)->model_type->common_public->action_cancel(*action); - free(*action); - *action = NULL; -} + XBT_DEBUG + ("After share resources, The size of modified actions set is %d", + xbt_swag_size(model->model_private->modified_set)); -void surf_action_change_state(surf_action_t action, - e_surf_action_state_t state) -{ - surf_action_state_t action_state = - &(action->model_type->common_public->states); - XBT_IN2("(%p,%s)", action, surf_action_state_names[state]); - xbt_swag_remove(action, action->state_set); - - if (state == SURF_ACTION_READY) - action->state_set = action_state->ready_action_set; - else if (state == SURF_ACTION_RUNNING) - action->state_set = action_state->running_action_set; - else if (state == SURF_ACTION_FAILED) - action->state_set = action_state->failed_action_set; - else if (state == SURF_ACTION_DONE) - action->state_set = action_state->done_action_set; + while((action = xbt_swag_extract(model->model_private->modified_set))) { + int max_dur_flag = 0; + + if (action->generic_action.state_set != + model->states.running_action_set) + continue; + + /* bogus priority, skip it */ + if (action->generic_action.priority <= 0) + continue; + + generic_update_action_remaining_lazy(action,now); + + min = -1; + value = lmm_variable_getvalue(action->variable); + if (value > 0) { + if (action->generic_action.remains > 0) { + value = action->generic_action.remains / value; + min = now + value; + } else { + value = 0.0; + min = now; + } + } + + if ((action->generic_action.max_duration != NO_MAX_DURATION) + && (min == -1 + || action->generic_action.start + + action->generic_action.max_duration < min)) { + min = action->generic_action.start + + action->generic_action.max_duration; + max_dur_flag = 1; + } + + XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, + action->generic_action.start, now + value, + action->generic_action.max_duration); + + if (min != -1) { + surf_action_lmm_heap_remove(model->model_private->action_heap,action); + surf_action_lmm_heap_insert(model->model_private->action_heap,action, min, max_dur_flag ? MAX_DURATION : NORMAL); + XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, + now); + } else DIE_IMPOSSIBLE; + } + + //hereafter must have already the min value for this resource model + if (xbt_heap_size(model->model_private->action_heap) > 0) + min = xbt_heap_maxkey(model->model_private->action_heap) - now; else - action->state_set = NULL; + min = -1; + + XBT_DEBUG("The minimum with the HEAP %lf", min); - if (action->state_set) - xbt_swag_insert(action, action->state_set); - XBT_OUT; + return min; +} +static XBT_INLINE void routing_asr_host_free(void *p) +{ + sg_routing_edge_t elm = p; + free(elm->name); + xbt_free(elm); } -void surf_action_set_data(surf_action_t action, void *data) +static XBT_INLINE void routing_asr_prop_free(void *p) { - action->data = data; + xbt_dict_t elm = p; + xbt_dict_free(&elm); +} + +void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { + *ver_major = SIMGRID_VERSION_MAJOR; + *ver_minor = SIMGRID_VERSION_MINOR; + *ver_patch = SIMGRID_VERSION_PATCH; } void surf_init(int *argc, char **argv) { - int i, j; - char *opt; - - const char *initial_path; + XBT_DEBUG("Create all Libs"); + host_lib = xbt_lib_new(); + link_lib = xbt_lib_new(); + as_router_lib = xbt_lib_new(); + storage_lib = xbt_lib_new(); + storage_type_lib = xbt_lib_new(); + watched_hosts_lib = xbt_dict_new(); + + XBT_DEBUG("Add routing levels"); + ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free); + ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free); + ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free); + + XBT_DEBUG("Add SURF levels"); + SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); xbt_init(argc, argv); - if (!surf_path) { - - /* retrieves the current directory of the current process */ - initial_path = __surf_get_initial_path(); - - xbt_assert0((initial_path), - "__surf_get_initial_path() failed! Can't resolves current Windows directory"); - - surf_path = xbt_dynar_new(sizeof(char *), NULL); - xbt_dynar_push(surf_path, &initial_path); - - for (i = 1; i < *argc; i++) { - if (!strncmp(argv[i], "--surf-path=", strlen("--surf-path="))) { - opt = strchr(argv[i], '='); - opt++; - xbt_dynar_push(surf_path, &opt); - /*remove this from argv */ - for (j = i + 1; j < *argc; j++) { - argv[j - 1] = argv[j]; - } - argv[j - 1] = NULL; - (*argc)--; - i--; /* compensate effect of next loop incrementation */ - } - } - } if (!model_list) model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL); if (!history) history = tmgr_history_new(); - if (!maxmin_system) - maxmin_system = lmm_system_new(); + + sg_config_init(argc, argv); + + surf_action_init(); + if (MC_is_active()) + MC_memory_init(); } -static char *path_name = NULL; +#ifdef _XBT_WIN32 +# define FILE_DELIM "\\" +#else +# define FILE_DELIM "/" /* FIXME: move to better location */ +#endif + FILE *surf_fopen(const char *name, const char *mode) { - int i; - char *path = NULL; + unsigned int cpt; + char *path_elm = NULL; + char *buff; FILE *file = NULL; - int path_name_len = 0; /* don't count '\0' */ - - xbt_assert0(name, "Need a non-NULL file name"); - xbt_assert0(surf_path, - "surf_init has to be called before using surf_fopen"); + 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); - } else { /* search relative files in the path */ + /* 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); - if (!path_name) { - path_name_len = strlen(name); - path_name = xbt_new0(char, path_name_len + 1); - } - - xbt_dynar_foreach(surf_path, i, 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); - } - sprintf(path_name, "%s/%s", path, name); - file = fopen(path_name, mode); - if (file) - return file; - } + if (file) + return file; } - return file; + return NULL; } void surf_exit(void) { - int i; + unsigned int iter; surf_model_t model = NULL; - xbt_dynar_foreach(model_list, i, model) { - model->common_private->finalize(); - } + sg_config_finalize(); + + xbt_dynar_foreach(model_list, iter, model) + model->model_private->finalize(); + xbt_dynar_free(&model_list); + routing_exit(); if (maxmin_system) { lmm_system_free(maxmin_system); @@ -414,109 +475,292 @@ void surf_exit(void) tmgr_history_free(history); history = NULL; } - if (model_list) - xbt_dynar_free(&model_list); + surf_action_exit(); + +#ifdef CONTEXT_THREADS + xbt_parmap_destroy(surf_parmap); + xbt_free(surf_mins); + surf_mins = NULL; +#endif + + xbt_dynar_free(&surf_path); + + xbt_lib_free(&host_lib); + xbt_lib_free(&link_lib); + xbt_lib_free(&as_router_lib); + xbt_lib_free(&storage_lib); + xbt_lib_free(&storage_type_lib); - if (surf_path) - xbt_dynar_free(&surf_path); + xbt_dict_free(&watched_hosts_lib); tmgr_finalize(); surf_parse_lex_destroy(); - if (path_name) { - free(path_name); - path_name = NULL; - } - xbt_exit(); + surf_parse_free_callbacks(); + + NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } -double surf_solve(void) +void surf_presolve(void) { - static int first_run = 1; + double next_event_date = -1.0; + tmgr_trace_event_t event = NULL; + double value = -1.0; + surf_resource_t resource = NULL; + surf_model_t model = NULL; + unsigned int iter; - double min = -1.0; + 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))) { + 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); +} + +double surf_solve(double max_date) +{ + min = -1.0; /* duration */ double next_event_date = -1.0; double model_next_action_end = -1.0; double value = -1.0; - surf_model_object_t model_obj = NULL; + surf_resource_t resource = NULL; surf_model_t model = NULL; tmgr_trace_event_t event = NULL; - int i; + unsigned int iter; - if (first_run) { - DEBUG0 - ("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 **) &model_obj))) { - model_obj->model->common_private-> - update_model_state(model_obj, event, value); - } - } - xbt_dynar_foreach(model_list, i, model) { - model->common_private->update_actions_state(NOW, 0.0); + if (max_date != -1.0 && max_date != NOW) { + min = max_date - NOW; + } + + XBT_DEBUG("Looking for next action end for all models except NS3"); + + if (surf_mins == NULL) { + surf_mins = xbt_new(double, xbt_dynar_length(model_list)); + } + surf_min_index = 0; + + + if (surf_get_nthreads() > 1) { + /* parallel version */ +#ifdef CONTEXT_THREADS + xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list); +#else + xbt_die("Asked to run in parallel, but no thread at hand..."); +#endif + } + else { + /* sequential version */ + xbt_dynar_foreach(model_list, iter, model) { + surf_share_resources(model); } - first_run = 0; - return 0.0; } - min = -1.0; - - DEBUG0("Looking for next action end"); - xbt_dynar_foreach(model_list, i, model) { - DEBUG1("Running for Resource [%s]", model->common_public->name); - model_next_action_end = - model->common_private->share_models(NOW); - DEBUG2("Resource [%s] : next action end = %f", - model->common_public->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; + unsigned i; + for (i = 0; i < xbt_dynar_length(model_list); i++) { + if ((min < 0.0 || surf_mins[i] < min) + && surf_mins[i] >= 0.0) { + min = surf_mins[i]; + } } - DEBUG1("Next action end : %f", min); - if (min < 0.0) - return -1.0; + XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", min); - 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) + XBT_DEBUG("Looking for next trace event"); + + do { + XBT_DEBUG("Next TRACE event : %f", next_event_date); + + next_event_date = tmgr_history_next_date(history); + + if(surf_network_model->name && !strcmp(surf_network_model->name,"network NS3")){ + if(next_event_date!=-1.0 && min!=-1.0) { + min = MIN(next_event_date - NOW, min); + } else{ + min = MAX(next_event_date - NOW, min); + } + + XBT_DEBUG("Run for network at most %f", min); + // run until min or next flow + model_next_action_end = surf_network_model->model_private->share_resources(min); + + XBT_DEBUG("Min for network : %f", model_next_action_end); + if(model_next_action_end>=0.0) + min = model_next_action_end; + } + + if (next_event_date == -1.0) { + XBT_DEBUG("no next TRACE event. Stop searching for it"); break; - DEBUG0("Updating models"); + } + + if ((min != -1.0) && (next_event_date > NOW + min)) break; + + XBT_DEBUG("Updating models"); while ((event = - tmgr_history_get_next_event_leq(history, next_event_date, - &value, - (void **) &model_obj))) { - if (model_obj->model->common_private-> - model_used(model_obj)) { - min = next_event_date - NOW; - DEBUG1 - ("This event will modify model state. Next event set to %f", - min); + 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; + 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 */ - model_obj->model->common_private-> - update_model_state(model_obj, event, value); + 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); } + } while (1); + + /* FIXME: Moved this test to here to avoid stopping 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 == -1.0) { + XBT_DEBUG("No next event at all. Bail out now."); + return -1.0; } - DEBUG1("Duration set to %f", min); + XBT_DEBUG("Duration set to %f", min); NOW = NOW + min; - xbt_dynar_foreach(model_list, i, model) { - model->common_private->update_actions_state(NOW, min); + if (surf_get_nthreads() > 1) { + /* parallel version */ +#ifdef CONTEXT_THREADS + xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_update_actions_state, model_list); +#endif + } + else { + /* sequential version */ + xbt_dynar_foreach(model_list, iter, model) { + surf_update_actions_state(model); + } } +#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; } + +static void surf_share_resources(surf_model_t model) +{ + double next_action_end = -1.0; + int i = __sync_fetch_and_add(&surf_min_index, 1); + if (strcmp(model->name,"network NS3")) { + XBT_DEBUG("Running for Resource [%s]", model->name); + next_action_end = model->model_private->share_resources(NOW); + XBT_DEBUG("Resource [%s] : next action end = %f", + model->name, next_action_end); + } + surf_mins[i] = next_action_end; +} + +static void surf_update_actions_state(surf_model_t model) +{ + model->model_private->update_actions_state(NOW, min); +} + +/** + * \brief Returns the number of parallel threads used to update the models. + * \return the number of threads (1 means no parallelism) + */ +int surf_get_nthreads(void) { + return surf_nthreads; +} + +/** + * \brief Sets the number of parallel threads used to update the models. + * + * A value of 1 means no parallelism. + * + * \param nb_threads the number of threads to use + */ +void surf_set_nthreads(int nthreads) { + + if (nthreads<=0) { + nthreads = xbt_os_get_numcores(); + XBT_INFO("Auto-setting surf/nthreads to %d",nthreads); + } + +#ifdef CONTEXT_THREADS + xbt_parmap_destroy(surf_parmap); + surf_parmap = NULL; +#endif + + if (nthreads > 1) { +#ifdef CONTEXT_THREADS + surf_parmap = xbt_parmap_new(nthreads, XBT_PARMAP_DEFAULT); +#else + THROWF(arg_error, 0, "Cannot activate parallel threads in Surf: your architecture does not support threads"); +#endif + } + + surf_nthreads = nthreads; +} + +/* This function is a pimple that we ought to fix. But it won't be easy. + * + * The surf_solve() function does properly return the set of actions that changed. + * Instead, each model change a global data, and then the caller of surf_solve must + * pick into these sets of action_failed and action_done. + * + * This was not clean but ok as long as we didn't had to restart the processes when the resource comes back up. + * We worked by putting sentinel actions on every resources we are interested in, + * so that surf informs us if/when the corresponding resource fails. + * + * But this does not work to get Simix informed of when a resource comes back up, and this is where this pimple comes. + * We have a set of resources that are currently down and for which simix needs to know when it comes back up. + * And the current function is called *at every simulation step* to sweep over that set, searching for a resource + * that was turned back up in the meanwhile. This is UGLY and slow. + * + * The proper solution would be to not rely on globals for the action_failed and action_done swags. + * They must be passed as parameter by the caller (the handling of these actions in simix may let you + * think that these two sets can be merged, but their handling in SimDag induce the contrary unless this + * simdag code can check by itself whether the action is done of failed -- seems very doable, but yet more + * cleanup to do). + * + * Once surf_solve() is passed the set of actions that changed, you want to add a new set of resources back up + * as parameter to this function. You also want to add a boolean field "restart_watched" to each resource, and + * make sure that whenever a resource with this field enabled comes back up, it's added to that set so that Simix + * sees it and react accordingly. This would kill that need for surf to call simix. + * + */ +void surf_watched_hosts(void) +{ + char *key; + void *host; + xbt_dict_cursor_t cursor; + + XBT_DEBUG("Check for host SURF_RESOURCE_ON on watched_hosts_lib"); + xbt_dict_foreach(watched_hosts_lib,cursor,key,host) + { + if(SIMIX_host_get_state(host) == SURF_RESOURCE_ON){ + XBT_INFO("Restart processes on host: %s",SIMIX_host_get_name(host)); + SIMIX_host_autorestart(host); + xbt_dict_remove(watched_hosts_lib,key); + } + else + XBT_DEBUG("See SURF_RESOURCE_OFF on host: %s",key); + } +}