X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..71b6a5d9705951c23178f8ebbf527904b9446fde:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index a2624dd729..4b948c1e0b 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -4,28 +4,29 @@ /* 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 "src/internal_config.h" #include "surf_private.h" #include "surf_interface.hpp" #include "network_interface.hpp" #include "cpu_interface.hpp" -#include "host_interface.hpp" +#include "src/surf/HostImpl.hpp" #include "src/simix/smx_host_private.h" #include "surf_routing.hpp" #include "simgrid/sg_config.h" #include "mc/mc.h" #include "virtual_machine.hpp" +#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals +#include "simgrid/s4u/engine.hpp" XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, - "Logging specific to SURF (kernel)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); /********* * Utils * *********/ /* 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 host models. */ + * The callback functions of cpu_model and network_model will be called from those of these host models. */ xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */ xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ @@ -49,88 +50,61 @@ s_surf_model_description_t surf_plugin_description[] = { {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). ", + {"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)", + {"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", + {"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).", + {"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_NS3 - {"NS3", - "Network pseudo-model using the NS3 tcp model instead of an analytic model", - surf_network_model_init_NS3}, +#if 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).", + {"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).", + {"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).", + {"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}, + {"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_host_model_description[] = { - {"default", - "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", - surf_host_model_init_current_default}, - {"compound", - "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}, + {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", surf_host_model_init_current_default}, + {"compound", "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_model_description[] = { - {"default", - "Default vm model.", - surf_vm_model_init_HL13}, + {"default", "Default vm model.", surf_vm_model_init_HL13}, {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}, + {"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}, + {"default", "Simplistic storage model.", surf_storage_model_init_default}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -#ifdef HAVE_THREAD_CONTEXTS +#if HAVE_THREAD_CONTEXTS static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif @@ -141,7 +115,7 @@ double surf_get_clock(void) return NOW; } -#ifdef _XBT_WIN32 +#ifdef _WIN32 # define FILE_DELIM "\\" #else # define FILE_DELIM "/" /* FIXME: move to better location */ @@ -171,7 +145,7 @@ FILE *surf_fopen(const char *name, const char *mode) return NULL; } -#ifdef _XBT_WIN32 +#ifdef _WIN32 #include #define MAX_DRIVE 26 static const char *disk_drives_letter_table[MAX_DRIVE] = { @@ -190,7 +164,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { const char *__surf_get_initial_path(void) { -#ifdef _XBT_WIN32 +#ifdef _WIN32 unsigned i; char current_directory[MAX_PATH + 1] = { 0 }; unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); @@ -218,7 +192,7 @@ const char *__surf_get_initial_path(void) */ int __surf_is_absolute_file_path(const char *file_path) { -#ifdef _XBT_WIN32 +#ifdef _WIN32 WIN32_FIND_DATA wfd = { 0 }; HANDLE hFile = FindFirstFile(file_path, &wfd); @@ -235,10 +209,8 @@ int __surf_is_absolute_file_path(const char *file_path) /** 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("Long description of the %s models accepted by this simulator:\n", category); + for (int i = 0; table[i].name; i++) printf(" %s: %s\n", table[i].name, table[i].description); } @@ -264,13 +236,7 @@ int find_model_description(s_surf_model_description_t * table, return -1; } -static XBT_INLINE void routing_asr_prop_free(void *p) -{ - //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_storage_free(void *r) +static inline void surf_storage_free(void *r) { delete static_cast(r); } @@ -301,25 +267,29 @@ void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { void surf_init(int *argc, char **argv) { + if (host_list != nullptr) // Already initialized + return; + XBT_DEBUG("Create all Libs"); host_list = xbt_dict_new_homogeneous([](void*p) { simgrid::s4u::Host* host = static_cast(p); simgrid::s4u::Host::onDestruction(*host); delete host; }); + USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); + 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_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_prop_free); + ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, NULL); XBT_DEBUG("Add SURF levels"); - simgrid::surf::Host::classInit(); + simgrid::surf::HostImpl::classInit(); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); @@ -373,12 +343,13 @@ void surf_exit(void) future_evt_set = nullptr; } -#ifdef HAVE_THREAD_CONTEXTS +#if HAVE_THREAD_CONTEXTS xbt_parmap_destroy(surf_parmap); #endif tmgr_finalize(); sg_platf_exit(); + simgrid::s4u::Engine::shutdown(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } @@ -391,32 +362,32 @@ namespace simgrid { namespace surf { Model::Model() - : p_maxminSystem(NULL) + : maxminSystem_(NULL) { - p_readyActionSet = new ActionList(); - p_runningActionSet = new ActionList(); - p_failedActionSet = new ActionList(); - p_doneActionSet = new ActionList(); + readyActionSet_ = new ActionList(); + runningActionSet_ = new ActionList(); + failedActionSet_ = new ActionList(); + doneActionSet_ = new ActionList(); - p_modifiedSet = NULL; - p_actionHeap = NULL; - p_updateMechanism = UM_UNDEFINED; - m_selectiveUpdate = 0; + modifiedSet_ = NULL; + actionHeap_ = NULL; + updateMechanism_ = UM_UNDEFINED; + selectiveUpdate_ = 0; } Model::~Model(){ - delete p_readyActionSet; - delete p_runningActionSet; - delete p_failedActionSet; - delete p_doneActionSet; + delete readyActionSet_; + delete runningActionSet_; + delete failedActionSet_; + delete doneActionSet_; } double Model::next_occuring_event(double now) { //FIXME: set the good function once and for all - if (p_updateMechanism == UM_LAZY) + if (updateMechanism_ == UM_LAZY) return next_occuring_event_lazy(now); - else if (p_updateMechanism == UM_FULL) + else if (updateMechanism_ == UM_FULL) return next_occuring_event_full(now); else xbt_die("Invalid cpu update mechanism!"); @@ -430,20 +401,20 @@ double Model::next_occuring_event_lazy(double now) XBT_DEBUG ("Before share resources, the size of modified actions set is %zd", - p_modifiedSet->size()); + modifiedSet_->size()); - lmm_solve(p_maxminSystem); + lmm_solve(maxminSystem_); XBT_DEBUG ("After share resources, The size of modified actions set is %zd", - p_modifiedSet->size()); + modifiedSet_->size()); - while(!p_modifiedSet->empty()) { - action = &(p_modifiedSet->front()); - p_modifiedSet->pop_front(); + while(!modifiedSet_->empty()) { + action = &(modifiedSet_->front()); + modifiedSet_->pop_front(); int max_dur_flag = 0; - if (action->getStateSet() != p_runningActionSet) + if (action->getStateSet() != runningActionSet_) continue; /* bogus priority, skip it */ @@ -482,15 +453,15 @@ double Model::next_occuring_event_lazy(double now) action->getMaxDuration()); if (min != -1) { - action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL); + action->heapUpdate(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; } //hereafter must have already the min value for this resource model - if (xbt_heap_size(p_actionHeap) > 0) - min = xbt_heap_maxkey(p_actionHeap) - now; + if (xbt_heap_size(actionHeap_) > 0) + min = xbt_heap_maxkey(actionHeap_) - now; else min = -1; @@ -560,9 +531,9 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, void Model::updateActionsState(double now, double delta) { - if (p_updateMechanism == UM_FULL) + if (updateMechanism_ == UM_FULL) updateActionsStateFull(now, delta); - else if (p_updateMechanism == UM_LAZY) + else if (updateMechanism_ == UM_LAZY) updateActionsStateLazy(now, delta); else xbt_die("Invalid cpu update mechanism!"); @@ -589,62 +560,51 @@ namespace simgrid { namespace surf { Resource::Resource(Model *model, const char *name) - : Resource(model, name, 1/*ON*/) + : name_(xbt_strdup(name)) + , model_(model) {} Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint) - : Resource(model, name, constraint, 1/*ON*/) -{} - -Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn) - : p_name(xbt_strdup(name)) - , p_model(model) - , m_isOn(initiallyOn) - , p_constraint(constraint) -{} - -Resource::Resource(Model *model, const char *name, int initiallyOn) - : p_name(xbt_strdup(name)) - , p_model(model) - , m_isOn(initiallyOn) + : name_(xbt_strdup(name)) + , model_(model) + , constraint_(constraint) {} - Resource::~Resource() { - xbt_free((void*)p_name); + xbt_free((void*)name_); } -bool Resource::isOn() { - return m_isOn; +bool Resource::isOn() const { + return isOn_; } -bool Resource::isOff() { - return ! m_isOn; +bool Resource::isOff() const { + return ! isOn_; } void Resource::turnOn() { - if (!m_isOn) { - m_isOn = true; - } + isOn_ = true; } void Resource::turnOff() { - if (m_isOn) { - m_isOn = false; - } + isOn_ = false; +} + +Model *Resource::getModel() const { + return model_; } -Model *Resource::getModel() { - return p_model; +const char *Resource::getName() const { + return name_; } -const char *Resource::getName() { - return p_name; +bool Resource::operator==(const Resource &other) const { + return strcmp(name_, other.name_); } -lmm_constraint_t Resource::getConstraint() { - return p_constraint; +lmm_constraint_t Resource::getConstraint() const { + return constraint_; } } @@ -674,17 +634,17 @@ namespace surf { void Action::initialize(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) { - m_remains = cost; - m_start = surf_get_clock(); - m_cost = cost; - p_model = model; - p_variable = var; + remains_ = cost; + start_ = surf_get_clock(); + cost_ = cost; + model_ = model; + variable_ = var; if (failed) - p_stateSet = getModel()->getFailedActionSet(); + stateSet_ = getModel()->getFailedActionSet(); else - p_stateSet = getModel()->getRunningActionSet(); + stateSet_ = getModel()->getRunningActionSet(); - p_stateSet->push_back(*this); + stateSet_->push_back(*this); } Action::Action(simgrid::surf::Model *model, double cost, bool failed) @@ -698,57 +658,60 @@ Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variab } Action::~Action() { - xbt_free(p_category); + xbt_free(category_); } void Action::finish() { - m_finish = surf_get_clock(); -} - -e_surf_action_state_t Action::getState() -{ - if (p_stateSet == getModel()->getReadyActionSet()) - return SURF_ACTION_READY; - if (p_stateSet == getModel()->getRunningActionSet()) - return SURF_ACTION_RUNNING; - if (p_stateSet == getModel()->getFailedActionSet()) - return SURF_ACTION_FAILED; - if (p_stateSet == getModel()->getDoneActionSet()) - return SURF_ACTION_DONE; - return SURF_ACTION_NOT_IN_THE_SYSTEM; -} - -void Action::setState(e_surf_action_state_t state) -{ - //surf_action_state_t action_state = &(action->model_type->states); - XBT_IN("(%p,%s)", this, surf_action_state_names[state]); - p_stateSet->erase(p_stateSet->iterator_to(*this)); - if (state == SURF_ACTION_READY) - p_stateSet = getModel()->getReadyActionSet(); - else if (state == SURF_ACTION_RUNNING) - p_stateSet = getModel()->getRunningActionSet(); - else if (state == SURF_ACTION_FAILED) - p_stateSet = getModel()->getFailedActionSet(); - else if (state == SURF_ACTION_DONE) - p_stateSet = getModel()->getDoneActionSet(); - else - p_stateSet = NULL; - - if (p_stateSet) - p_stateSet->push_back(*this); - XBT_OUT(); + finishTime_ = surf_get_clock(); +} + +Action::State Action::getState() +{ + if (stateSet_ == getModel()->getReadyActionSet()) + return Action::State::ready; + if (stateSet_ == getModel()->getRunningActionSet()) + return Action::State::running; + if (stateSet_ == getModel()->getFailedActionSet()) + return Action::State::failed; + if (stateSet_ == getModel()->getDoneActionSet()) + return Action::State::done; + return Action::State::not_in_the_system; +} + +void Action::setState(Action::State state) +{ + stateSet_->erase(stateSet_->iterator_to(*this)); + switch (state) { + case Action::State::ready: + stateSet_ = getModel()->getReadyActionSet(); + break; + case Action::State::running: + stateSet_ = getModel()->getRunningActionSet(); + break; + case Action::State::failed: + stateSet_ = getModel()->getFailedActionSet(); + break; + case Action::State::done: + stateSet_ = getModel()->getDoneActionSet(); + break; + default: + stateSet_ = NULL; + break; + } + if (stateSet_) + stateSet_->push_back(*this); } double Action::getBound() { - return (p_variable) ? lmm_variable_getbound(p_variable) : 0; + return (variable_) ? lmm_variable_getbound(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 (variable_) + lmm_update_variable_bound(getModel()->getMaxminSystem(), variable_, bound); if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock()) heapRemove(getModel()->getActionHeap()); @@ -757,35 +720,35 @@ void Action::setBound(double bound) double Action::getStartTime() { - return m_start; + return start_; } double Action::getFinishTime() { /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */ - return m_remains == 0 ? m_finish : -1; + return remains_ == 0 ? finishTime_ : -1; } void Action::setData(void* data) { - p_data = data; + data_ = data; } void Action::setCategory(const char *category) { XBT_IN("(%p,%s)", this, category); - p_category = xbt_strdup(category); + category_ = xbt_strdup(category); XBT_OUT(); } void Action::ref(){ - m_refcount++; + refcount_++; } void Action::setMaxDuration(double duration) { XBT_IN("(%p,%g)", this, duration); - m_maxDuration = duration; + maxDuration_ = duration; if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap heapRemove(getModel()->getActionHeap()); XBT_OUT(); @@ -796,7 +759,7 @@ void Action::gapRemove() {} void Action::setPriority(double priority) { XBT_IN("(%p,%g)", this, priority); - m_priority = priority; + priority_ = priority; lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority); if (getModel()->getUpdateMechanism() == UM_LAZY) @@ -805,7 +768,7 @@ void Action::setPriority(double priority) } void Action::cancel(){ - setState(SURF_ACTION_FAILED); + setState(Action::State::failed); if (getModel()->getUpdateMechanism() == UM_LAZY) { if (action_lmm_hook.is_linked()) getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); @@ -814,10 +777,10 @@ void Action::cancel(){ } int Action::unref(){ - m_refcount--; - if (!m_refcount) { + refcount_--; + if (!refcount_) { if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); if (getModel()->getUpdateMechanism() == UM_LAZY) { @@ -835,9 +798,9 @@ int Action::unref(){ void Action::suspend() { XBT_IN("(%p)", this); - if (m_suspended != 2) { + if (suspended_ != 2) { lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - m_suspended = 1; + suspended_ = 1; if (getModel()->getUpdateMechanism() == UM_LAZY) heapRemove(getModel()->getActionHeap()); } @@ -847,9 +810,9 @@ void Action::suspend() void Action::resume() { XBT_IN("(%p)", this); - if (m_suspended != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), m_priority); - m_suspended = 0; + if (suspended_ != 2) { + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority_); + suspended_ = 0; if (getModel()->getUpdateMechanism() == UM_LAZY) heapRemove(getModel()->getActionHeap()); } @@ -858,7 +821,7 @@ void Action::resume() bool Action::isSuspended() { - return m_suspended == 1; + return 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: @@ -869,30 +832,30 @@ bool Action::isSuspended() */ void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat) { - m_hat = hat; + hat_ = hat; xbt_heap_push(heap, this, key); } void Action::heapRemove(xbt_heap_t heap) { - m_hat = NOTSET; - if (m_indexHeap >= 0) { - xbt_heap_remove(heap, m_indexHeap); + hat_ = NOTSET; + if (indexHeap_ >= 0) { + xbt_heap_remove(heap, indexHeap_); } } 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); + hat_ = hat; + if (indexHeap_ >= 0) { + xbt_heap_update(heap, indexHeap_, key); }else{ xbt_heap_push(heap, this, key); } } void Action::updateIndexHeap(int i) { - m_indexHeap = i; + indexHeap_ = i; } double Action::getRemains() @@ -902,12 +865,12 @@ double Action::getRemains() if (getModel()->getUpdateMechanism() == UM_LAZY) /* update remains before return it */ updateRemainingLazy(surf_get_clock()); XBT_OUT(); - return m_remains; + return remains_; } double Action::getRemainsNoUpdate() { - return m_remains; + return remains_; } //FIXME split code in the right places @@ -917,54 +880,50 @@ void Action::updateRemainingLazy(double now) if(getModel() == surf_network_model) { - if (m_suspended != 0) + if (suspended_ != 0) return; } else { - xbt_assert(p_stateSet == getModel()->getRunningActionSet(), - "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."); + xbt_assert(stateSet_ == getModel()->getRunningActionSet(), "You're updating an action that is not running."); + xbt_assert(priority_ > 0, "You're updating an action that seems suspended."); } - delta = now - m_lastUpdate; + delta = now - 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, sg_surf_precision*sg_maxmin_precision); + if (remains_ > 0) { + XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_); + double_update(&remains_, lastValue_ * delta, sg_surf_precision*sg_maxmin_precision); if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) { simgrid::surf::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); + TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); } - XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); + XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_); } if(getModel() == surf_network_model) { - if (m_maxDuration != NO_MAX_DURATION) - double_update(&m_maxDuration, delta, sg_surf_precision); + if (maxDuration_ != NO_MAX_DURATION) + double_update(&maxDuration_, delta, sg_surf_precision); //FIXME: duplicated code - if ((m_remains <= 0) && + if ((remains_ <= 0) && (lmm_get_variable_weight(getVariable()) > 0)) { finish(); - setState(SURF_ACTION_DONE); + setState(Action::State::done); heapRemove(getModel()->getActionHeap()); - } else if (((m_maxDuration != NO_MAX_DURATION) - && (m_maxDuration <= 0))) { + } else if (((maxDuration_ != NO_MAX_DURATION) + && (maxDuration_ <= 0))) { finish(); - setState(SURF_ACTION_DONE); + setState(Action::State::done); heapRemove(getModel()->getActionHeap()); } } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + lastUpdate_ = now; + lastValue_ = lmm_variable_getvalue(getVariable()); } }