X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63d18c86bbffb905a9d31dc2384596cead30529a..d844aaa2a39a19ad330496f3a6de7b7c7092afa8:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 178b7b1431..cb51390fc2 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -4,126 +4,106 @@ /* 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 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; /* for invoking callbacks */ +xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ -tmgr_history_t history = NULL; -lmm_system_t maxmin_system = NULL; +simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; xbt_dynar_t surf_path = NULL; -xbt_dynar_t host_that_restart = NULL; +xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), NULL); xbt_dict_t watched_hosts_lib; -surf_callback(void, void) surfExitCallbacks; +namespace simgrid { +namespace surf { + +simgrid::xbt::signal surfExitCallbacks; + +} +} + +#include // FIXME: this plugin should not be linked to the core 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 */ }; -/* 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 CONTEXT_THREADS +#if HAVE_THREAD_CONTEXTS static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif @@ -134,7 +114,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 */ @@ -164,7 +144,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] = { @@ -183,7 +163,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); @@ -211,7 +191,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); @@ -228,10 +208,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); } @@ -257,37 +235,26 @@ 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_host_free(void *r) -{ - delete static_cast(r); -} - -static XBT_INLINE void surf_storage_free(void *r) +static inline void surf_storage_free(void *r) { - delete static_cast(r); + delete static_cast(r); } void sg_version_check(int lib_version_major,int lib_version_minor,int lib_version_patch) { if ((lib_version_major != SIMGRID_VERSION_MAJOR) || (lib_version_minor != SIMGRID_VERSION_MINOR)) { fprintf(stderr, - "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Please fix this.\n", + "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Please fix this.\n", SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH, - lib_version_major,lib_version_minor,lib_version_patch); + lib_version_major,lib_version_minor,lib_version_patch); abort(); } if (lib_version_patch != SIMGRID_VERSION_PATCH) { fprintf(stderr, - "Warning: Your program was compiled with SimGrid version %d.%d.%d, " - "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", + "Warning: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. Proceeding anyway.\n", SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH, - lib_version_major,lib_version_minor,lib_version_patch); + lib_version_major,lib_version_minor,lib_version_patch); } } @@ -299,30 +266,38 @@ 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_lib = xbt_lib_new(); + 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"); - SURF_HOST_LEVEL = xbt_lib_add_level(host_lib,surf_host_free); + simgrid::surf::HostImpl::classInit(); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); xbt_init(argc, argv); if (!all_existing_models) - all_existing_models = xbt_dynar_new(sizeof(Model*), NULL); + all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(Model*), NULL); - if (!history) - history = tmgr_history_new(); + model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); + if (!future_evt_set) + future_evt_set = new simgrid::trace_mgr::future_evt_set(); TRACE_add_start_function(TRACE_surf_alloc); TRACE_add_end_function(TRACE_surf_release); @@ -336,7 +311,7 @@ void surf_init(int *argc, char **argv) void surf_exit(void) { unsigned int iter; - Model *model = NULL; + simgrid::surf::Model *model = NULL; TRACE_end(); /* Just in case it was not called by the upper * layer (or there is no upper layer) */ @@ -346,7 +321,7 @@ void surf_exit(void) xbt_dynar_free(&host_that_restart); xbt_dynar_free(&surf_path); - xbt_lib_free(&host_lib); + xbt_dict_free(&host_list); xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); sg_link_exit(); @@ -360,24 +335,19 @@ void surf_exit(void) xbt_dynar_free(&model_list_invoke); routing_exit(); - surf_callback_emit(surfExitCallbacks); + simgrid::surf::surfExitCallbacks(); - if (maxmin_system) { - lmm_system_free(maxmin_system); - maxmin_system = NULL; - } - if (history) { - tmgr_history_free(history); - history = NULL; + if (future_evt_set) { + delete future_evt_set; + future_evt_set = nullptr; } -#ifdef CONTEXT_THREADS +#if HAVE_THREAD_CONTEXTS xbt_parmap_destroy(surf_parmap); #endif tmgr_finalize(); - surf_parse_lex_destroy(); - surf_parse_free_callbacks(); + sg_platf_exit(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } @@ -386,39 +356,42 @@ void surf_exit(void) * Model * *********/ +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::shareResources(double now) +double Model::next_occuring_event(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); + if (updateMechanism_ == UM_LAZY) + return next_occuring_event_lazy(now); + else if (updateMechanism_ == UM_FULL) + return next_occuring_event_full(now); else xbt_die("Invalid cpu update mechanism!"); } -double Model::shareResourcesLazy(double now) +double Model::next_occuring_event_lazy(double now) { Action *action = NULL; double min = -1; @@ -426,20 +399,20 @@ double Model::shareResourcesLazy(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 */ @@ -478,15 +451,15 @@ double Model::shareResourcesLazy(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; @@ -495,7 +468,7 @@ double Model::shareResourcesLazy(double now) return min; } -double Model::shareResourcesFull(double /*now*/) { +double Model::next_occuring_event_full(double /*now*/) { THROW_UNIMPLEMENTED; } @@ -532,7 +505,7 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, for (++it; it != itend; ++it) { - action = &*it; + action = &*it; value = lmm_variable_getvalue(action->getVariable()); if (value > 0) { if (action->getRemains() > 0) @@ -556,12 +529,12 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, void Model::updateActionsState(double now, double delta) { - if (p_updateMechanism == UM_FULL) - updateActionsStateFull(now, delta); - else if (p_updateMechanism == UM_LAZY) - updateActionsStateLazy(now, delta); + if (updateMechanism_ == UM_FULL) + updateActionsStateFull(now, delta); + else if (updateMechanism_ == UM_LAZY) + updateActionsStateLazy(now, delta); else - xbt_die("Invalid cpu update mechanism!"); + xbt_die("Invalid cpu update mechanism!"); } void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) @@ -574,79 +547,80 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) THROW_UNIMPLEMENTED; } +} +} + /************ * Resource * ************/ -Resource::Resource() -: p_name(NULL), p_properties(NULL), p_model(NULL) -{} +namespace simgrid { +namespace surf { -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(Model *model, const char *name) + : Resource(model, name, 1/*ON*/) {} -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(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) + : name_(xbt_strdup(name)) + , model_(model) + , isOn_(initiallyOn) + , constraint_(constraint) {} -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(Model *model, const char *name, int initiallyOn) + : name_(xbt_strdup(name)) + , model_(model) + , isOn_(initiallyOn) {} -Resource::~Resource() { - xbt_free((void*)p_name); - xbt_dict_free(&p_properties); -} -e_surf_resource_state_t Resource::getState() -{ - return m_stateCurrent; +Resource::~Resource() { + xbt_free((void*)name_); } -void Resource::setState(e_surf_resource_state_t state) -{ - m_stateCurrent = state; +bool Resource::isOn() { + return isOn_; } - -bool Resource::isOn() -{ - return m_running; +bool Resource::isOff() { + return ! isOn_; } void Resource::turnOn() { - if (!m_running) { - m_running = true; + if (!isOn_) { + isOn_ = true; } } void Resource::turnOff() { - if (m_running) { - m_running = false; + if (isOn_) { + isOn_ = false; } } -Model *Resource::getModel() { - return p_model; +Model *Resource::getModel() const { + return model_; } -const char *Resource::getName() { - return p_name; +const char *Resource::getName() const { + return name_; } -xbt_dict_t Resource::getProperties() { - if (p_properties==NULL) - p_properties = xbt_dict_new(); - return p_properties; +bool Resource::operator==(const Resource &other) const { + return strcmp(name_, other.name_); } lmm_constraint_t Resource::getConstraint() { - return p_constraint; + return constraint_; +} + +} } /********** @@ -662,26 +636,22 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -void Action::initialize(Model *model, double cost, bool failed, +/* added to manage the communication action's heap */ +void surf_action_lmm_update_index_heap(void *action, int i) { + static_cast(action)->updateIndexHeap(i); +} + +namespace simgrid { +namespace surf { + +void Action::initialize(simgrid::surf::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; - p_category = NULL; - p_stateHookup.prev = 0; - p_stateHookup.next = 0; if (failed) p_stateSet = getModel()->getFailedActionSet(); else @@ -690,12 +660,12 @@ void Action::initialize(Model *model, double cost, bool failed, p_stateSet->push_back(*this); } -Action::Action(Model *model, double cost, bool failed) +Action::Action(simgrid::surf::Model *model, double cost, bool failed) { initialize(model, cost, failed); } -Action::Action(Model *model, double cost, bool failed, lmm_variable_t var) +Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) { initialize(model, cost, failed, var); } @@ -708,38 +678,41 @@ void Action::finish() { m_finish = surf_get_clock(); } -e_surf_action_state_t Action::getState() +Action::State Action::getState() { if (p_stateSet == getModel()->getReadyActionSet()) - return SURF_ACTION_READY; + return Action::State::ready; if (p_stateSet == getModel()->getRunningActionSet()) - return SURF_ACTION_RUNNING; + return Action::State::running; if (p_stateSet == getModel()->getFailedActionSet()) - return SURF_ACTION_FAILED; + return Action::State::failed; if (p_stateSet == getModel()->getDoneActionSet()) - return SURF_ACTION_DONE; - return SURF_ACTION_NOT_IN_THE_SYSTEM; + return Action::State::done; + return Action::State::not_in_the_system; } -void Action::setState(e_surf_action_state_t state) +void Action::setState(Action::State 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) + switch (state) { + case Action::State::ready: p_stateSet = getModel()->getReadyActionSet(); - else if (state == SURF_ACTION_RUNNING) + break; + case Action::State::running: p_stateSet = getModel()->getRunningActionSet(); - else if (state == SURF_ACTION_FAILED) + break; + case Action::State::failed: p_stateSet = getModel()->getFailedActionSet(); - else if (state == SURF_ACTION_DONE) + break; + case Action::State::done: p_stateSet = getModel()->getDoneActionSet(); - else + break; + default: p_stateSet = NULL; - + break; + } if (p_stateSet) p_stateSet->push_back(*this); - XBT_OUT(); } double Action::getBound() @@ -803,12 +776,12 @@ void Action::setPriority(double priority) lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority); if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); + heapRemove(getModel()->getActionHeap()); XBT_OUT(); } 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)); @@ -894,11 +867,6 @@ void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat) } } -/* added to manage the communication action's heap */ -void surf_action_lmm_update_index_heap(void *action, int i) { - static_cast(action)->updateIndexHeap(i); -} - void Action::updateIndexHeap(int i) { m_indexHeap = i; } @@ -945,7 +913,8 @@ void Action::updateRemainingLazy(double now) double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision); 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))); + 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); } XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains); @@ -960,12 +929,12 @@ void Action::updateRemainingLazy(double now) if ((m_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))) { finish(); - setState(SURF_ACTION_DONE); + setState(Action::State::done); heapRemove(getModel()->getActionHeap()); } } @@ -973,3 +942,6 @@ void Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } + +} +}