X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c05dfe218c074e59069153299e731409a9e83a..90a471de6cd70b41223dd16a09fafe6ac3e18269:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index b5c3a805fe..8a7caad677 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -16,6 +16,7 @@ #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)"); @@ -26,12 +27,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke /* 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. */ -xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */ -xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ +std::vector * all_existing_models = nullptr; /* to destroy models correctly */ +xbt_dynar_t model_list_invoke = nullptr; /* to invoke callbacks */ simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; -xbt_dynar_t surf_path = NULL; -xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), NULL); +xbt_dynar_t surf_path = nullptr; +xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), nullptr); xbt_dict_t watched_hosts_lib; namespace simgrid { @@ -46,7 +47,7 @@ simgrid::xbt::signal 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 */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; /* Don't forget to update the option description in smx_config when you change this */ @@ -71,45 +72,45 @@ s_surf_model_description_t surf_network_model_description[] = { 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 */ + {nullptr, nullptr, nullptr} /* this array must be nullptr 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 */ + {nullptr, nullptr, nullptr} /* this array must be nullptr 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}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; s_surf_model_description_t surf_vm_model_description[] = { {"default", "Default vm model.", surf_vm_model_init_HL13}, - {NULL, NULL, NULL} /* this array must be NULL terminated */ + {nullptr, nullptr, nullptr} /* this array must be nullptr 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 */ + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", nullptr}, + {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr}, + {nullptr, nullptr, nullptr} /* this array must be nullptr 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 */ + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; #if HAVE_THREAD_CONTEXTS -static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ +static xbt_parmap_t surf_parmap = nullptr; /* parallel map on models */ #endif double NOW = 0; -double surf_get_clock(void) +double surf_get_clock() { return NOW; } @@ -123,9 +124,9 @@ double surf_get_clock(void) FILE *surf_fopen(const char *name, const char *mode) { unsigned int cpt; - char *path_elm = NULL; + char *path_elm = nullptr; char *buff; - FILE *file = NULL; + FILE *file = nullptr; xbt_assert(name); @@ -141,7 +142,7 @@ FILE *surf_fopen(const char *name, const char *mode) if (file) return file; } - return NULL; + return nullptr; } #ifdef _WIN32 @@ -160,7 +161,7 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { * directory on Unix/Linux platforms. */ -const char *__surf_get_initial_path(void) +const char *__surf_get_initial_path() { #ifdef _WIN32 @@ -170,7 +171,7 @@ const char *__surf_get_initial_path(void) char root[4] = { 0 }; if (!len) - return NULL; + return nullptr; strncpy(root, current_directory, 3); @@ -179,7 +180,7 @@ const char *__surf_get_initial_path(void) return disk_drives_letter_table[i]; } - return NULL; + return nullptr; #else return "./"; #endif @@ -217,7 +218,7 @@ int find_model_description(s_surf_model_description_t * table, const char *name) { int i; - char *name_list = NULL; + char *name_list = nullptr; for (i = 0; table[i].name; i++) if (!strcmp(name, table[i].name)) { @@ -228,8 +229,8 @@ int find_model_description(s_surf_model_description_t * table, 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, ", "); - strcat(name_list, table[i].name); + strncat(name_list, ", ", 2); + strncat(name_list, table[i].name, strlen(table[i].name)); } xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); return -1; @@ -245,16 +246,25 @@ void sg_version_check(int lib_version_major,int lib_version_minor,int lib_versio 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", - 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, + SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); abort(); } if (lib_version_patch != SIMGRID_VERSION_PATCH) { + if(SIMGRID_VERSION_PATCH >= 90 || lib_version_patch >=90){ + fprintf(stderr, + "FATAL ERROR: Your program was compiled with SimGrid version %d.%d.%d, " + "and then linked against SimGrid %d.%d.%d. \n" + "One of them is a development version, and should not be mixed with the stable release. Please fix this.\n", + lib_version_major,lib_version_minor,lib_version_patch, + SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); + abort(); + } fprintf(stderr, "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, + SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); } } @@ -275,17 +285,19 @@ void surf_init(int *argc, char **argv) simgrid::s4u::Host::onDestruction(*host); delete host; }); - USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL); + USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); 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); - + watched_hosts_lib = xbt_dict_new_homogeneous(nullptr); XBT_DEBUG("Add routing levels"); - ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, NULL); + ROUTING_PROP_ASR_LEVEL = xbt_lib_add_level(as_router_lib, nullptr); + ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib, [](void* p) { + delete static_cast(p); + }); XBT_DEBUG("Add SURF levels"); simgrid::surf::HostImpl::classInit(); @@ -293,9 +305,9 @@ void surf_init(int *argc, char **argv) xbt_init(argc, argv); if (!all_existing_models) - all_existing_models = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); + all_existing_models = new std::vector(); if (!model_list_invoke) - model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), NULL); + model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr); if (!future_evt_set) future_evt_set = new simgrid::trace_mgr::future_evt_set(); @@ -308,13 +320,9 @@ void surf_init(int *argc, char **argv) MC_memory_init(); } -void surf_exit(void) +void surf_exit() { - unsigned int iter; - simgrid::surf::Model *model = NULL; - - TRACE_end(); /* Just in case it was not called by the upper - * layer (or there is no upper layer) */ + TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ sg_config_finalize(); @@ -329,9 +337,9 @@ void surf_exit(void) xbt_lib_free(&file_lib); xbt_dict_free(&watched_hosts_lib); - xbt_dynar_foreach(all_existing_models, iter, model) + for (auto model : *all_existing_models) delete model; - xbt_dynar_free(&all_existing_models); + delete all_existing_models; xbt_dynar_free(&model_list_invoke); routing_exit(); @@ -348,6 +356,7 @@ void surf_exit(void) tmgr_finalize(); sg_platf_exit(); + simgrid::s4u::Engine::shutdown(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } @@ -360,15 +369,15 @@ namespace simgrid { namespace surf { Model::Model() - : maxminSystem_(NULL) + : maxminSystem_(nullptr) { readyActionSet_ = new ActionList(); runningActionSet_ = new ActionList(); failedActionSet_ = new ActionList(); doneActionSet_ = new ActionList(); - modifiedSet_ = NULL; - actionHeap_ = NULL; + modifiedSet_ = nullptr; + actionHeap_ = nullptr; updateMechanism_ = UM_UNDEFINED; selectiveUpdate_ = 0; } @@ -393,7 +402,7 @@ double Model::next_occuring_event(double now) double Model::next_occuring_event_lazy(double now) { - Action *action = NULL; + Action *action = nullptr; double min = -1; double share; @@ -470,13 +479,14 @@ double Model::next_occuring_event_lazy(double now) double Model::next_occuring_event_full(double /*now*/) { THROW_UNIMPLEMENTED; + return 0.0; } double Model::shareResourcesMaxMin(ActionList *running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)) { - Action *action = NULL; + Action *action = nullptr; double min = -1; double value = -1; @@ -632,17 +642,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) @@ -656,60 +666,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(); + finishTime_ = surf_get_clock(); } Action::State Action::getState() { - if (p_stateSet == getModel()->getReadyActionSet()) + if (stateSet_ == getModel()->getReadyActionSet()) return Action::State::ready; - if (p_stateSet == getModel()->getRunningActionSet()) + if (stateSet_ == getModel()->getRunningActionSet()) return Action::State::running; - if (p_stateSet == getModel()->getFailedActionSet()) + if (stateSet_ == getModel()->getFailedActionSet()) return Action::State::failed; - if (p_stateSet == getModel()->getDoneActionSet()) + if (stateSet_ == getModel()->getDoneActionSet()) return Action::State::done; return Action::State::not_in_the_system; } void Action::setState(Action::State state) { - p_stateSet->erase(p_stateSet->iterator_to(*this)); + stateSet_->erase(stateSet_->iterator_to(*this)); switch (state) { case Action::State::ready: - p_stateSet = getModel()->getReadyActionSet(); + stateSet_ = getModel()->getReadyActionSet(); break; case Action::State::running: - p_stateSet = getModel()->getRunningActionSet(); + stateSet_ = getModel()->getRunningActionSet(); break; case Action::State::failed: - p_stateSet = getModel()->getFailedActionSet(); + stateSet_ = getModel()->getFailedActionSet(); break; case Action::State::done: - p_stateSet = getModel()->getDoneActionSet(); + stateSet_ = getModel()->getDoneActionSet(); break; default: - p_stateSet = NULL; + stateSet_ = nullptr; break; } - if (p_stateSet) - p_stateSet->push_back(*this); + 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()); @@ -718,35 +728,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(); @@ -757,7 +767,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) @@ -775,10 +785,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) { @@ -796,9 +806,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()); } @@ -808,9 +818,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()); } @@ -819,7 +829,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: @@ -830,30 +840,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() @@ -863,12 +873,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 @@ -878,54 +888,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(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(Action::State::done); heapRemove(getModel()->getActionHeap()); } } - m_lastUpdate = now; - m_lastValue = lmm_variable_getvalue(getVariable()); + lastUpdate_ = now; + lastValue_ = lmm_variable_getvalue(getVariable()); } }