X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad2e588c6af6cf84b18ba7c1c96f4f9785d93c28..e36ab8605881c80995e3df732c33bd44bd4eda86:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 206e8e0238..e6fdd84087 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2013. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,12 +8,12 @@ #include "surf_interface.hpp" #include "network_interface.hpp" #include "cpu_interface.hpp" -#include "workstation_interface.hpp" -#include "vm_workstation_interface.hpp" +#include "host_interface.hpp" #include "simix/smx_host_private.h" #include "surf_routing.hpp" #include "simgrid/sg_config.h" #include "mc/mc.h" +#include "vm_interface.hpp" XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, @@ -25,29 +25,35 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, /* 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. + * 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. + * 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. + * 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). + * 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. + * 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. * */ @@ -78,9 +84,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, xbt_dynar_free(&hosts); }*/ -/* model_list_invoke contains only surf_workstation and surf_vm_workstation. +/* model_list_invoke contains only surf_host and surf_vm. * The callback functions of cpu_model and network_model will be called from - * those of these workstation models. */ + * those of these host models. */ xbt_dynar_t model_list = NULL; /* for destroying all models correctly */ xbt_dynar_t model_list_invoke = NULL; /* for invoking callbacks */ @@ -90,14 +96,15 @@ xbt_dynar_t surf_path = NULL; xbt_dynar_t host_that_restart = NULL; xbt_dict_t watched_hosts_lib; +surf_callback(void, void) surfExitCallbacks; + s_surf_model_description_t surf_plugin_description[] = { - {"Energy", - "Cpu energy consumption.", - sg_energy_plugin_init}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {"Energy", "Cpu energy consumption.", sg_energy_plugin_init}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -/* Don't forget to update the option description in smx_config when you change this */ +/* 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). ", @@ -108,6 +115,9 @@ s_surf_model_description_t surf_network_model_description[] = { {"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}, + {"IB", + "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", + surf_network_model_init_IB}, {"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}, @@ -140,22 +150,22 @@ s_surf_model_description_t surf_cpu_model_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -s_surf_model_description_t surf_workstation_model_description[] = { +s_surf_model_description_t surf_host_model_description[] = { {"default", - "Default workstation model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", - surf_workstation_model_init_current_default}, + "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", + surf_host_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}, + "Host model that is automatically chosen if you change the network and CPU models", + surf_host_model_init_compound}, + {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", + surf_host_model_init_ptask_L07}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -s_surf_model_description_t surf_vm_workstation_model_description[] = { +s_surf_model_description_t surf_vm_model_description[] = { {"default", - "Default vm workstation model.)", - surf_vm_workstation_model_init_current_default}, + "Default vm model.", + surf_vm_model_init_HL13}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -184,9 +194,6 @@ static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif double NOW = 0; -double *surf_mins = NULL; /* return value of share_resources for each model */ -int surf_min_index; /* current index in surf_mins */ -double surf_min; /* duration determined by surf_solve */ double surf_get_clock(void) { @@ -223,42 +230,14 @@ FILE *surf_fopen(const char *name, const char *mode) return NULL; } - -#ifndef MAX_DRIVE -#define MAX_DRIVE 26 -#endif - #ifdef _XBT_WIN32 #include +#define MAX_DRIVE 26 static const char *disk_drives_letter_table[MAX_DRIVE] = { - "A:\\", - "B:\\", - "C:\\", - "D:\\", - "E:\\", - "F:\\", - "G:\\", - "H:\\", - "I:\\", - "J:\\", - "K:\\", - "L:\\", - "M:\\", - "N:\\", - "O:\\", - "P:\\", - "Q:\\", - "R:\\", - "S:\\", - "T:\\", - "U:\\", - "V:\\", - "W:\\", - "X:\\", - "Y:\\", - "Z:\\" + "A:\\","B:\\","C:\\","D:\\","E:\\","F:\\","G:\\","H:\\","I:\\","J:\\","K:\\","L:\\","M:\\", + "N:\\","O:\\","P:\\","Q:\\","R:\\","S:\\","T:\\","U:\\","V:\\","W:\\","X:\\","Y:\\","Z:\\" }; -#endif +#endif /* * Returns the initial path. On Windows the initial path is @@ -332,7 +311,9 @@ int find_model_description(s_surf_model_description_t * table, if (!strcmp(name, table[i].name)) { return i; } - name_list = strdup(table[0].name); + if (!table[0].name) + xbt_die("No model is valid! This is a bug."); + name_list = xbt_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, ", "); @@ -342,30 +323,20 @@ int find_model_description(s_surf_model_description_t * table, 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); + //xbt_dict_t elm = (xbt_dict_t) p; + //xbt_dict_free(&elm); FIXME: leaking in some case? That's a sometimes double-free with AsCluster::~AsCluster } -static XBT_INLINE void surf_cpu_free(void *r) +static XBT_INLINE void surf_host_free(void *r) { - delete static_cast(r); + delete static_cast(r); } -static XBT_INLINE void surf_link_free(void *r) +static XBT_INLINE void surf_storage_free(void *r) { - delete static_cast(r); -} - -static XBT_INLINE void surf_workstation_free(void *r) -{ - delete static_cast(r); + delete static_cast(r); } @@ -379,34 +350,31 @@ 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(); + file_lib = xbt_lib_new(); watched_hosts_lib = xbt_dict_new_homogeneous(NULL); + sg_host_init(); + 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); + SURF_HOST_LEVEL = xbt_lib_add_level(host_lib,surf_host_free); + SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); if (!model_list) - model_list = xbt_dynar_new(sizeof(ModelPtr), NULL); + model_list = xbt_dynar_new(sizeof(Model*), NULL); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(ModelPtr), NULL); + model_list_invoke = xbt_dynar_new(sizeof(Model*), 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); @@ -417,21 +385,32 @@ void surf_init(int *argc, char **argv) void surf_exit(void) { unsigned int iter; - ModelPtr model = NULL; + Model *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_free(&host_that_restart); + xbt_dynar_free(&surf_path); + + xbt_lib_free(&host_lib); + xbt_lib_free(&as_router_lib); + xbt_lib_free(&storage_lib); + sg_link_exit(); + xbt_lib_free(&storage_type_lib); + xbt_lib_free(&file_lib); + xbt_dict_free(&watched_hosts_lib); + xbt_dynar_foreach(model_list, iter, model) delete model; xbt_dynar_free(&model_list); xbt_dynar_free(&model_list_invoke); routing_exit(); + surf_callback_emit(surfExitCallbacks); + if (maxmin_system) { lmm_system_free(maxmin_system); maxmin_system = NULL; @@ -445,20 +424,6 @@ void surf_exit(void) xbt_parmap_destroy(surf_parmap); #endif - xbt_free(surf_mins); - surf_mins = NULL; - - 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(); @@ -470,9 +435,8 @@ void surf_exit(void) * Model * *********/ -Model::Model(const char *name) - : p_name(name) - , p_maxminSystem(NULL) +Model::Model() + : p_maxminSystem(NULL) { p_readyActionSet = new ActionList(); p_runningActionSet = new ActionList(); @@ -496,53 +460,54 @@ double Model::shareResources(double now) { //FIXME: set the good function once and for all if (p_updateMechanism == UM_LAZY) - return shareResourcesLazy(now); + return shareResourcesLazy(now); else if (p_updateMechanism == UM_FULL) - return shareResourcesFull(now); + return shareResourcesFull(now); else - xbt_die("Invalid cpu update mechanism!"); + xbt_die("Invalid cpu update mechanism!"); } double Model::shareResourcesLazy(double now) { - ActionPtr action = NULL; + Action *action = NULL; double min = -1; - double value; + double share; XBT_DEBUG - ("Before share resources, the size of modified actions set is %d", + ("Before share resources, the size of modified actions set is %zd", p_modifiedSet->size()); lmm_solve(p_maxminSystem); XBT_DEBUG - ("After share resources, The size of modified actions set is %d", + ("After share resources, The size of modified actions set is %zd", p_modifiedSet->size()); while(!p_modifiedSet->empty()) { - action = &(p_modifiedSet->front()); - p_modifiedSet->pop_front(); + action = &(p_modifiedSet->front()); + p_modifiedSet->pop_front(); int max_dur_flag = 0; if (action->getStateSet() != p_runningActionSet) continue; /* bogus priority, skip it */ - if (action->getPriority() <= 0) + if (action->getPriority() <= 0 || action->getHat()==LATENCY) continue; action->updateRemainingLazy(now); min = -1; - value = lmm_variable_getvalue(action->getVariable()); - if (value > 0) { + share = lmm_variable_getvalue(action->getVariable()); + + if (share > 0) { + double time_to_completion; if (action->getRemains() > 0) { - value = action->getRemains() / value; - min = now + value; + time_to_completion = action->getRemainsNoUpdate() / share; } else { - value = 0.0; - min = now; + time_to_completion = 0.0; } + min = now + time_to_completion; // when the task will complete if nothing changes } if ((action->getMaxDuration() != NO_MAX_DURATION) @@ -550,18 +515,20 @@ double Model::shareResourcesLazy(double now) || action->getStartTime() + action->getMaxDuration() < min)) { min = action->getStartTime() + - action->getMaxDuration(); + action->getMaxDuration(); // when the task will complete anyway because of the deadline if any max_dur_flag = 1; } - XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, - action->getStartTime(), now + value, + + XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->getVariable()->id_int); + + XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action, + action->getStartTime(), min, share, action->getMaxDuration()); if (min != -1) { - action->heapRemove(p_actionHeap); - action->heapInsert(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); - XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, + action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); + XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now); } else DIE_IMPOSSIBLE; } @@ -572,7 +539,7 @@ double Model::shareResourcesLazy(double now) else min = -1; - XBT_DEBUG("The minimum with the HEAP %lf", min); + XBT_DEBUG("The minimum with the HEAP %f", min); return min; } @@ -581,11 +548,11 @@ double Model::shareResourcesFull(double /*now*/) { THROW_UNIMPLEMENTED; } -double Model::shareResourcesMaxMin(ActionListPtr running_actions, +double Model::shareResourcesMaxMin(ActionList *running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { - ActionPtr action = NULL; + Action *action = NULL; double min = -1; double value = -1; @@ -593,7 +560,7 @@ double Model::shareResourcesMaxMin(ActionListPtr running_actions, ActionList::iterator it(running_actions->begin()), itend(running_actions->end()); for(; it != itend ; ++it) { - action = &*it; + action = &*it; value = lmm_variable_getvalue(action->getVariable()); if ((value > 0) || (action->getMaxDuration() >= 0)) break; @@ -604,7 +571,7 @@ double Model::shareResourcesMaxMin(ActionListPtr running_actions, if (value > 0) { if (action->getRemains() > 0) - min = action->getRemains() / value; + min = action->getRemainsNoUpdate() / value; else min = 0.0; if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) @@ -618,7 +585,7 @@ double Model::shareResourcesMaxMin(ActionListPtr running_actions, value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { if (action->getRemains() > 0) - value = action->getRemains() / value; + value = action->getRemainsNoUpdate() / value; else value = 0.0; if (value < min) { @@ -648,10 +615,12 @@ void Model::updateActionsState(double now, double delta) void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) { + THROW_UNIMPLEMENTED; } void Model::updateActionsStateFull(double /*now*/, double /*delta*/) { + THROW_UNIMPLEMENTED; } /************ @@ -662,19 +631,19 @@ Resource::Resource() : p_name(NULL), p_properties(NULL), p_model(NULL) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) +Resource::Resource(Model *model, const char *name, xbt_dict_t props) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(SURF_RESOURCE_ON) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint) +Resource::Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(SURF_RESOURCE_ON), p_constraint(constraint) {} -Resource::Resource(surf_model_t model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) - : p_name(xbt_strdup(name)), p_properties(props), p_model(model) - , m_running(true), m_stateCurrent(stateInit) +Resource::Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit) + : p_name(xbt_strdup(name)), p_properties(props), p_model(model) + , m_running(true), m_stateCurrent(stateInit) {} Resource::~Resource() { @@ -711,7 +680,7 @@ void Resource::turnOff() } } -ModelPtr Resource::getModel() { +Model *Resource::getModel() { return p_model; } @@ -720,6 +689,8 @@ const char *Resource::getName() { } xbt_dict_t Resource::getProperties() { + if (p_properties==NULL) + p_properties = xbt_dict_new(); return p_properties; } @@ -740,28 +711,29 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -Action::Action() -: m_refcount(1) -{} +void Action::initialize(Model *model, double cost, bool failed, + lmm_variable_t var) +{ + m_priority = 1.0; + m_refcount = 1; + m_remains = cost; + m_maxDuration = NO_MAX_DURATION; + m_finish = -1.0; + m_start = surf_get_clock(); + m_cost = cost; + p_model = model; + p_data = NULL; + p_variable = var; + m_lastValue = 0; + m_lastUpdate = 0; + m_suspended = false; + m_hat = NOTSET; +} -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_data(NULL) - , p_model(model) - , m_refcount(1) - , m_lastValue(0) - , m_lastUpdate(0) - , m_suspended(false) - , p_variable(NULL) +Action::Action(Model *model, double cost, bool failed) { - #ifdef HAVE_TRACING - p_category = NULL; - #endif + initialize(model, cost, failed); + p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; if (failed) @@ -772,24 +744,10 @@ Action::Action(ModelPtr model, double cost, bool failed) p_stateSet->push_back(*this); } -Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) - : 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_data(NULL) - , p_model(model) - , m_refcount(1) - , m_lastValue(0) - , m_lastUpdate(0) - , m_suspended(false) - , p_variable(var) +Action::Action(Model *model, double cost, bool failed, lmm_variable_t var) { - #ifdef HAVE_TRACING - p_category = NULL; - #endif + initialize(model, cost, failed, var); + p_category = NULL; p_stateHookup.prev = 0; p_stateHookup.next = 0; if (failed) @@ -801,9 +759,7 @@ Action::Action(ModelPtr model, double cost, bool failed, lmm_variable_t var) } Action::~Action() { -#ifdef HAVE_TRACING xbt_free(p_category); -#endif } void Action::finish() { @@ -840,7 +796,23 @@ void Action::setState(e_surf_action_state_t state) p_stateSet = NULL; if (p_stateSet) - p_stateSet->push_back(*this); + p_stateSet->push_back(*this); + XBT_OUT(); +} + +double Action::getBound() +{ + return (p_variable) ? lmm_variable_getbound(p_variable) : 0; +} + +void Action::setBound(double bound) +{ + XBT_IN("(%p,%g)", this, bound); + if (p_variable) + lmm_update_variable_bound(getModel()->getMaxminSystem(), p_variable, bound); + + if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock()) + heapRemove(getModel()->getActionHeap()); XBT_OUT(); } @@ -860,14 +832,12 @@ void Action::setData(void* data) p_data = data; } -#ifdef HAVE_TRACING void Action::setCategory(const char *category) { XBT_IN("(%p,%s)", this, category); p_category = xbt_strdup(category); XBT_OUT(); } -#endif void Action::ref(){ m_refcount++; @@ -898,8 +868,8 @@ void Action::setPriority(double priority) void Action::cancel(){ setState(SURF_ACTION_FAILED); if (getModel()->getUpdateMechanism() == UM_LAZY) { - if (actionLmmHook::is_linked()) - getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); + if (actionLmmHook::is_linked()) + getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); heapRemove(getModel()->getActionHeap()); } } @@ -907,18 +877,18 @@ void Action::cancel(){ int Action::unref(){ m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); - if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); - if (getModel()->getUpdateMechanism() == UM_LAZY) { - /* remove from heap */ - heapRemove(getModel()->getActionHeap()); + if (actionHook::is_linked()) + p_stateSet->erase(p_stateSet->iterator_to(*this)); + if (getVariable()) + lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); + if (getModel()->getUpdateMechanism() == UM_LAZY) { + /* remove from heap */ + heapRemove(getModel()->getActionHeap()); if (actionLmmHook::is_linked()) - getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); + getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); } - delete this; - return 1; + delete this; + return 1; } return 0; } @@ -972,9 +942,19 @@ void Action::heapRemove(xbt_heap_t heap) } } +void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat) +{ + m_hat = hat; + if (m_indexHeap >= 0) { + xbt_heap_update(heap, m_indexHeap, key); + }else{ + xbt_heap_push(heap, this, key); + } +} + /* added to manage the communication action's heap */ void surf_action_lmm_update_index_heap(void *action, int i) { - ((ActionPtr)action)->updateIndexHeap(i); + static_cast(action)->updateIndexHeap(i); } void Action::updateIndexHeap(int i) { @@ -1001,7 +981,7 @@ void Action::updateRemainingLazy(double now) { double delta = 0.0; - if(getModel() == static_cast(surf_network_model)) + if(getModel() == surf_network_model) { if (m_suspended != 0) return; @@ -1020,21 +1000,19 @@ void Action::updateRemainingLazy(double now) 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); + double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision); -#ifdef HAVE_TRACING - if (getModel() == static_cast(surf_cpu_model_pm) && TRACE_is_enabled()) { - ResourcePtr cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); + if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) { + Resource *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0))); TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate); } -#endif XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); } - if(getModel() == static_cast(surf_network_model)) + if(getModel() == surf_network_model) { if (m_maxDuration != NO_MAX_DURATION) - double_update(&m_maxDuration, delta); + double_update(&m_maxDuration, delta, sg_surf_precision); //FIXME: duplicated code if ((m_remains <= 0) && @@ -1053,4 +1031,3 @@ void Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -