X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83ff63f9a846dd01995a4bbb8979d2fa909ed34b..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/surf/surf.cpp diff --git a/src/surf/surf.cpp b/src/surf/surf.cpp index 6508e38abd..2d9661742c 100644 --- a/src/surf/surf.cpp +++ b/src/surf/surf.cpp @@ -1,22 +1,24 @@ +#include "surf_private.h" #include "surf.hpp" +#include "network.hpp" #include "cpu.hpp" +#include "workstation.hpp" +#include "vm_workstation.hpp" #include "simix/smx_host_private.h" +#include "surf_routing.hpp" +#include "simgrid/sg_config.h" +#include "mc/mc.h" -XBT_LOG_NEW_CATEGORY(surfpp, "All SURF categories"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surfpp_kernel, surfpp, +extern "C" { +XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); +} /********* * Utils * *********/ -double NOWW = 0; - -XBT_INLINE double surf_get_clock(void) -{ - return NOWW; -} - /* 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. @@ -50,21 +52,19 @@ static void remove_watched_host(void *key) xbt_dict_remove(watched_hosts_lib, *(char**)key); } -/*TODO: keepit void surf_watched_hosts(void) +/*void surf_watched_hosts(void) { char *key; - void *_host; - smx_host_t host; + void *host; xbt_dict_cursor_t cursor; xbt_dynar_t hosts = xbt_dynar_new(sizeof(char*), NULL); XBT_DEBUG("Check for host SURF_RESOURCE_ON on watched_hosts_lib"); - xbt_dict_foreach(watched_hosts_lib,cursor,key,_host) + xbt_dict_foreach(watched_hosts_lib, cursor, key, host) { - host = (smx_host_t) 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); + if(SIMIX_host_get_state((smx_host_t)host) == SURF_RESOURCE_ON){ + XBT_INFO("Restart processes on host: %s", SIMIX_host_get_name((smx_host_t)host)); + SIMIX_host_autorestart((smx_host_t)host); xbt_dynar_push_as(hosts, char*, key); } else @@ -74,10 +74,385 @@ static void remove_watched_host(void *key) xbt_dynar_free(&hosts); }*/ +/* model_list_invoke contains only surf_workstation and surf_vm_workstation. + * The callback functions of cpu_model and network_model will be called from + * those of these workstation models. */ +xbt_dynar_t model_list = NULL; /* for destroying all models correctly */ +xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */ + +tmgr_history_t history = NULL; +lmm_system_t maxmin_system = NULL; +xbt_dynar_t surf_path = NULL; +xbt_dynar_t host_that_restart = NULL; +xbt_dict_t watched_hosts_lib; + +/* Don't forget to update the option description in smx_config when you change this */ +s_surf_model_description_t surf_network_model_description[] = { + {"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", + "Network pseudo-model using the GTNets simulator instead of an analytic model", + surf_network_model_init_GTNETS}, +#endif +#ifdef HAVE_NS3 + {"NS3", + "Network pseudo-model using the NS3 tcp model instead of an analytic model", + surf_network_model_init_NS3}, +#endif + {"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 */ +}; + +s_surf_model_description_t surf_cpu_model_description[] = { + {"Cas01", + "Simplistic CPU model (time=size/power).", + surf_cpu_model_init_Cas01}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; + +s_surf_model_description_t surf_workstation_model_description[] = { + {"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_vm_workstation_model_description[] = { + {"default", + "Default vm workstation model.)", + surf_vm_workstation_model_init_current_default}, + {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 */ +}; + +#ifdef CONTEXT_THREADS +static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ +#endif + +static double *surf_mins = NULL; /* return value of share_resources for each model */ + +double NOW = 0; + +double surf_get_clock(void) +{ + return NOW; +} + +#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) +{ + unsigned int cpt; + char *path_elm = NULL; + char *buff; + FILE *file = NULL; + + xbt_assert(name); + + 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); + file = fopen(buff, mode); + free(buff); + + if (file) + return file; + } + return NULL; +} + +/* + * Returns the initial path. On Windows the initial path is + * the current directory for the current process in the other + * case the function returns "./" that represents the current + * directory on Unix/Linux platforms. + */ + +const char *__surf_get_initial_path(void) +{ + +#ifdef _XBT_WIN32 + unsigned i; + char current_directory[MAX_PATH + 1] = { 0 }; + unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); + char root[4] = { 0 }; + + if (!len) + return NULL; + + strncpy(root, current_directory, 3); + + for (i = 0; i < MAX_DRIVE; i++) { + if (toupper(root[0]) == disk_drives_letter_table[i][0]) + return disk_drives_letter_table[i]; + } + + return NULL; +#else + return "./"; +#endif +} + +/* The __surf_is_absolute_file_path() returns 1 if + * file_path is a absolute file path, in the other + * case the function returns 0. + */ +int __surf_is_absolute_file_path(const char *file_path) +{ +#ifdef _XBT_WIN32 + WIN32_FIND_DATA wfd = { 0 }; + HANDLE hFile = FindFirstFile(file_path, &wfd); + + if (INVALID_HANDLE_VALUE == hFile) + return 0; + + FindClose(hFile); + return 1; +#else + return (file_path[0] == '/'); +#endif +} + +/** 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) +{ + int i; + char *name_list = NULL; + + for (i = 0; table[i].name; i++) + if (!strcmp(name, table[i].name)) { + return i; + } + name_list = strdup(table[0].name); + for (i = 1; table[i].name; i++) { + name_list = (char *) xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 3); + strcat(name_list, ", "); + strcat(name_list, table[i].name); + } + xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); + return -1; +} + +static XBT_INLINE void routing_asr_host_free(void *p) +{ + delete ((RoutingEdgePtr) p); +} + +static XBT_INLINE void routing_asr_prop_free(void *p) +{ + xbt_dict_t elm = (xbt_dict_t) p; + xbt_dict_free(&elm); +} + +static XBT_INLINE void surf_cpu_free(void *r) +{ + delete dynamic_cast(static_cast(r)); +} + +static XBT_INLINE void surf_link_free(void *r) +{ + delete dynamic_cast(static_cast(r)); +} + +static XBT_INLINE void surf_workstation_free(void *r) +{ + delete dynamic_cast(static_cast(r)); +} + + +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) +{ + 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_homogeneous(NULL); + + 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_cpu_free); + SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_workstation_free); + SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_link_free); + + xbt_init(argc, argv); + if (!model_list) + model_list = xbt_dynar_new(sizeof(ModelPtr), NULL); + if (!model_list_invoke) + model_list_invoke = xbt_dynar_new(sizeof(ModelPtr), NULL); + if (!history) + history = tmgr_history_new(); + +#ifdef HAVE_TRACING + TRACE_add_start_function(TRACE_surf_alloc); + TRACE_add_end_function(TRACE_surf_release); +#endif + + sg_config_init(argc, argv); + + if (MC_is_active()) + MC_memory_init(); +} + +void surf_exit(void) +{ + unsigned int iter; + ModelPtr model = NULL; + +#ifdef HAVE_TRACING + TRACE_end(); /* Just in case it was not called by the upper + * layer (or there is no upper layer) */ +#endif + + sg_config_finalize(); + + xbt_dynar_foreach(model_list, iter, model) + delete model; + xbt_dynar_free(&model_list); + xbt_dynar_free(&model_list_invoke); + routing_exit(); + + if (maxmin_system) { + lmm_system_free(maxmin_system); + maxmin_system = NULL; + } + if (history) { + tmgr_history_free(history); + history = NULL; + } + +#ifdef CONTEXT_THREADS + xbt_parmap_destroy(surf_parmap); + xbt_free(surf_mins); + surf_mins = NULL; +#endif + xbt_dynar_free(&host_that_restart); + 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); + + xbt_dict_free(&watched_hosts_lib); + + tmgr_finalize(); + surf_parse_lex_destroy(); + surf_parse_free_callbacks(); + + NOW = 0; /* Just in case the user plans to restart the simulation afterward */ +} /********* * Model * *********/ +Model::Model(string name) + : p_maxminSystem(0), m_name(name), + m_resOnCB(0), m_resOffCB(0), + m_actCancelCB(0), m_actSuspendCB(0), m_actResumeCB(0) +{ + ActionPtr action = NULL; + p_readyActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_runningActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_failedActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + p_doneActionSet = xbt_swag_new(xbt_swag_offset(*action, p_stateHookup)); + + p_modifiedSet = NULL; + p_actionHeap = NULL; + p_updateMechanism = UM_UNDEFINED; + m_selectiveUpdate = 0; +} + +Model::~Model(){ +xbt_swag_free(p_readyActionSet); +xbt_swag_free(p_runningActionSet); +xbt_swag_free(p_failedActionSet); +xbt_swag_free(p_doneActionSet); +} + +double Model::shareResources(double now) +{ + //FIXME: set the good function once and for all + if (p_updateMechanism == UM_LAZY) + return shareResourcesLazy(now); + else if (p_updateMechanism == UM_FULL) + return shareResourcesFull(now); + else + xbt_die("Invalid cpu update mechanism!"); +} + double Model::shareResourcesLazy(double now) { ActionLmmPtr action = NULL; @@ -94,7 +469,7 @@ double Model::shareResourcesLazy(double now) ("After share resources, The size of modified actions set is %d", xbt_swag_size(p_modifiedSet)); - while((action = (ActionLmmPtr) xbt_swag_extract(p_modifiedSet))) { + while((action = static_cast(xbt_swag_extract(p_modifiedSet)))) { int max_dur_flag = 0; if (action->p_stateSet != p_runningActionSet) @@ -150,27 +525,30 @@ double Model::shareResourcesLazy(double now) return min; } -double Model::shareResourcesFull(xbt_swag_t running_actions, - size_t offset, +double Model::shareResourcesFull(double /*now*/) { + THROW_UNIMPLEMENTED; +} + + +double Model::shareResourcesMaxMin(xbt_swag_t running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { void *_action = NULL; - ActionPtr action = NULL; + ActionLmmPtr action = NULL; double min = -1; double value = -1; -#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) solve(sys); xbt_swag_foreach(_action, running_actions) { - action = (ActionPtr)_action; - value = lmm_variable_getvalue(VARIABLE(action)); + action = dynamic_cast(static_cast(_action)); + value = lmm_variable_getvalue(action->p_variable); if ((value > 0) || (action->m_maxDuration >= 0)) break; } - if (!action) + if (!_action) return -1.0; if (value > 0) { @@ -184,10 +562,11 @@ double Model::shareResourcesFull(xbt_swag_t running_actions, min = action->m_maxDuration; - for (action = (ActionPtr) xbt_swag_getNext(action, running_actions->offset); - action; - action = (ActionPtr) xbt_swag_getNext(action, running_actions->offset)) { - value = lmm_variable_getvalue(VARIABLE(action)); + for (_action = xbt_swag_getNext(static_cast(action), running_actions->offset); + _action; + _action = xbt_swag_getNext(static_cast(action), running_actions->offset)) { + action = dynamic_cast(static_cast(_action)); + value = lmm_variable_getvalue(action->p_variable); if (value > 0) { if (action->m_remains > 0) value = action->m_remains / value; @@ -205,19 +584,25 @@ double Model::shareResourcesFull(xbt_swag_t running_actions, } XBT_DEBUG("min value : %f", min); -#undef VARIABLE return min; } -void Model::gapRemove(ActionLmmPtr action) {} - +void Model::updateActionsState(double now, double delta) +{ + if (p_updateMechanism == UM_FULL) + updateActionsStateFull(now, delta); + else if (p_updateMechanism == UM_LAZY) + updateActionsStateLazy(now, delta); + else + xbt_die("Invalid cpu update mechanism!"); +} -void Model::updateActionsStateLazy(double now, double delta) +void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) { } -void Model::updateActionsStateFull(double now, double delta) +void Model::updateActionsStateFull(double /*now*/, double /*delta*/) { } @@ -278,13 +663,33 @@ void Model::notifyActionSuspend(ActionPtr a) * Resource * ************/ -string Resource::getName() { +Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props) + : m_name(xbt_strdup(name)), m_properties(props), p_model(model), m_running(true) +{} + +Resource::Resource(){ + //FIXME:free(m_name); + //FIXME:xbt_dict_free(&m_properties); +} + +const char *Resource::getName() +{ return m_name; } +xbt_dict_t Resource::getProperties() +{ + return m_properties; +} + e_surf_resource_state_t Resource::getState() { - return m_stateCurrent; + return p_stateCurrent; +} + +void Resource::setState(e_surf_resource_state_t state) +{ + p_stateCurrent = state; } bool Resource::isOn() @@ -308,27 +713,77 @@ void Resource::turnOff() } } +ResourceLmm::ResourceLmm(surf_model_t model, const char *name, xbt_dict_t props, + lmm_system_t system, + double constraint_value, + tmgr_history_t history, + e_surf_resource_state_t state_init, + tmgr_trace_t state_trace, + double metric_peak, + tmgr_trace_t metric_trace) + : Resource(model, name, props) +{ + p_constraint = lmm_constraint_new(system, this, constraint_value); + p_stateCurrent = state_init; + if (state_trace) + p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast(this)); + p_power.scale = 1.0; + p_power.peak = metric_peak; + if (metric_trace) + p_power.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, static_cast(this)); +} + /********** * Action * **********/ -/* added to manage the communication action's heap */ -void surf_action_lmm_update_index_heap(void *action, int i) { - ((ActionLmmPtr)action)->updateIndexHeap(i); -} -void ActionLmm::updateIndexHeap(int i) -{ - m_indexHeap = i; -} - -/*TODO/const char *surf_action_state_names[6] = { +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" -};*/ +}; + +Action::Action(){} + +Action::Action(ModelPtr model, double cost, bool failed): + m_priority(1.0), + m_failed(failed), + m_start(surf_get_clock()), m_finish(-1.0), + m_remains(cost), + m_maxDuration(NO_MAX_DURATION), + m_cost(cost), + p_model(model), + m_refcount(1) +{ + #ifdef HAVE_TRACING + p_category = NULL; + #endif + p_stateHookup.prev = 0; + p_stateHookup.next = 0; + if (failed) + p_stateSet = p_model->p_failedActionSet; + else + p_stateSet = p_model->p_runningActionSet; + + xbt_swag_insert(this, p_stateSet); +} + +Action::~Action() {} + +int Action::unref(){ + DIE_IMPOSSIBLE; +} + +void Action::cancel(){ + DIE_IMPOSSIBLE; +} + +void Action::recycle(){ + DIE_IMPOSSIBLE; +} e_surf_action_state_t Action::getState() { @@ -376,6 +831,13 @@ double Action::getFinishTime() return m_remains == 0 ? m_finish : -1; } +double Action::getRemains() +{ + XBT_IN("(%p)", this); + XBT_OUT(); + return m_remains; +} + void Action::setData(void* data) { p_data = data; @@ -390,6 +852,88 @@ void Action::setCategory(const char *category) } #endif +void Action::ref(){ + m_refcount++; +} + +void ActionLmm::setMaxDuration(double duration) +{ + XBT_IN("(%p,%g)", this, duration); + m_maxDuration = duration; + if (p_model->p_updateMechanism == UM_LAZY) // remove action from the heap + heapRemove(p_model->p_actionHeap); + XBT_OUT(); +} + +void ActionLmm::gapRemove() {} + +void ActionLmm::setPriority(double priority) +{ + XBT_IN("(%p,%g)", this, priority); + m_priority = priority; + lmm_update_variable_weight(p_model->p_maxminSystem, p_variable, priority); + + if (p_model->p_updateMechanism == UM_LAZY) + heapRemove(p_model->p_actionHeap); + XBT_OUT(); +} + +void ActionLmm::cancel(){ + setState(SURF_ACTION_FAILED); + if (p_model->p_updateMechanism == UM_LAZY) { + xbt_swag_remove(this, p_model->p_modifiedSet); + heapRemove(p_model->p_actionHeap); + } +} + +int ActionLmm::unref(){ + m_refcount--; + if (!m_refcount) { + xbt_swag_remove(static_cast(this), p_stateSet); + if (p_variable) + lmm_variable_free(p_model->p_maxminSystem, p_variable); + if (p_model->p_updateMechanism == UM_LAZY) { + /* remove from heap */ + heapRemove(p_model->p_actionHeap); + xbt_swag_remove(this, p_model->p_modifiedSet); + } +#ifdef HAVE_TRACING + xbt_free(p_category); +#endif + delete this; + return 1; + } + return 0; +} + +void ActionLmm::suspend() +{ + XBT_IN("(%p)", this); + if (m_suspended != 2) { + lmm_update_variable_weight(p_model->p_maxminSystem, p_variable, 0.0); + m_suspended = 1; + if (p_model->p_updateMechanism == UM_LAZY) + heapRemove(p_model->p_actionHeap); + } + XBT_OUT(); +} + +void ActionLmm::resume() +{ + XBT_IN("(%p)", this); + if (m_suspended != 2) { + lmm_update_variable_weight(p_model->p_maxminSystem, p_variable, m_priority); + m_suspended = 0; + if (p_model->p_updateMechanism == UM_LAZY) + heapRemove(p_model->p_actionHeap); + } + XBT_OUT(); +} + +bool ActionLmm::isSuspended() +{ + return m_suspended == 1; +} /* insert action on heap using a given key and a hat (heap_action_type) * a hat can be of three types for communications: * @@ -411,16 +955,83 @@ void ActionLmm::heapRemove(xbt_heap_t heap) } } +/* added to manage the communication action's heap */ +void surf_action_lmm_update_index_heap(void *action, int i) { + ((ActionLmmPtr)action)->updateIndexHeap(i); +} + +void ActionLmm::updateIndexHeap(int i) { + m_indexHeap = i; +} + double ActionLmm::getRemains() { XBT_IN("(%p)", this); /* update remains before return it */ - if (p_updateMechanism == UM_LAZY) /* update remains before return it */ + if (p_model->p_updateMechanism == UM_LAZY) /* update remains before return it */ updateRemainingLazy(surf_get_clock()); XBT_OUT(); return m_remains; } +//FIXME split code in the right places +void ActionLmm::updateRemainingLazy(double now) +{ + double delta = 0.0; + + if(p_model == static_cast(surf_network_model)) + { + if (m_suspended != 0) + return; + } + else + { + xbt_assert(p_stateSet == p_model->p_runningActionSet, + "You're updating an action that is not running."); + + /* bogus priority, skip it */ + xbt_assert(m_priority > 0, + "You're updating an action that seems suspended."); + } + + delta = now - m_lastUpdate; + + if (m_remains > 0) { + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate); + double_update(&m_remains, m_lastValue * delta); + +#ifdef HAVE_TRACING + if (p_model == static_cast(surf_cpu_model_pm) && TRACE_is_enabled()) { + ResourcePtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(p_model->p_maxminSystem, p_variable, 0))); + TRACE_surf_host_set_utilization(cpu->m_name, p_category, m_lastValue, m_lastUpdate, now - m_lastUpdate); + } +#endif + XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); + } + + if(p_model == static_cast(surf_network_model)) + { + if (m_maxDuration != NO_MAX_DURATION) + double_update(&m_maxDuration, delta); + + //FIXME: duplicated code + if ((m_remains <= 0) && + (lmm_get_variable_weight(p_variable) > 0)) { + m_finish = surf_get_clock(); + setState(SURF_ACTION_DONE); + heapRemove(p_model->p_actionHeap); + } else if (((m_maxDuration != NO_MAX_DURATION) + && (m_maxDuration <= 0))) { + m_finish = surf_get_clock(); + setState(SURF_ACTION_DONE); + heapRemove(p_model->p_actionHeap); + } + } + + m_lastUpdate = now; + m_lastValue = lmm_variable_getvalue(p_variable); +} + /*void Action::cancel() { p_model->notifyActionCancel(this);