X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db0f43297c09f46aef0085384a3c78f20af03407..682027cc097d0a94e9bf2c7dc819db2f2c24f440:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 6c607d5494..c07fe792db 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,21 +1,19 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* 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 "surf_interface.hpp" -#include "cpu_interface.hpp" #include "mc/mc.h" -#include "network_interface.hpp" -#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.h" #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals -#include "src/internal_config.h" #include "src/kernel/routing/NetPoint.hpp" -#include "src/simix/smx_host_private.h" #include "src/surf/HostImpl.hpp" -#include "surf_private.h" + +#include +#include +#include #include XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); @@ -28,46 +26,55 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke std::vector * all_existing_models = nullptr; /* to destroy models correctly */ simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; -xbt_dynar_t surf_path = nullptr; +std::vector surf_path; std::vector host_that_restart; -xbt_dict_t watched_hosts_lib; +/** set of hosts for which one want to be notified if they ever restart. */ +std::set watched_hosts; +extern std::map storage_types; namespace simgrid { namespace surf { -simgrid::xbt::signal surfExitCallbacks; - +simgrid::xbt::signal surfExitCallbacks; } } -#include // FIXME: this plugin should not be linked to the core +#include // FIXME: this plug-in should not be linked to the core +#include // FIXME: this plug-in should not be linked to the core s_surf_model_description_t surf_plugin_description[] = { {"Energy", "Cpu energy consumption.", &sg_host_energy_plugin_init}, + {"Load", "Cpu load.", &sg_host_load_plugin_init}, {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; /* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", - &surf_network_model_init_LegrandVelho}, - {"Constant", - "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.", - &surf_network_model_init_Constant}, - {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", - &surf_network_model_init_SMPI}, - {"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}, - {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3}, - {"Reno", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno}, - {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Reno2}, - {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", - &surf_network_model_init_Vegas}, - {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ + {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " + "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ", + &surf_network_model_init_LegrandVelho}, + {"Constant", "Simplistic network model where all communication take a constant time (one second). This model " + "provides the lowest realism, but is (marginally) faster.", + &surf_network_model_init_Constant}, + {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with " + "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + &surf_network_model_init_SMPI}, + {"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}, + {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3}, + {"Reno", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Reno}, + {"Reno2", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Reno2}, + {"Vegas", + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + &surf_network_model_init_Vegas}, + {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; #if ! HAVE_SMPI @@ -78,7 +85,7 @@ void surf_network_model_init_IB() { xbt_die("Please activate SMPI support in cmake to use the IB network model."); } #endif -#if !HAVE_NS3 +#if !SIMGRID_HAVE_NS3 void surf_network_model_init_NS3() { xbt_die("Please activate NS3 support in cmake and install the dependencies to use the NS3 network model."); } @@ -108,10 +115,6 @@ s_surf_model_description_t surf_storage_model_description[] = { {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; -#if HAVE_THREAD_CONTEXTS -static xbt_parmap_t surf_parmap = nullptr; /* parallel map on models */ -#endif - double NOW = 0; double surf_get_clock() @@ -125,11 +128,30 @@ double surf_get_clock() # define FILE_DELIM "/" /* FIXME: move to better location */ #endif +std::ifstream* surf_ifsopen(std::string name) +{ + std::ifstream* fs = new std::ifstream(); + xbt_assert(not name.empty()); + if (__surf_is_absolute_file_path(name.c_str())) { /* don't mess with absolute file names */ + fs->open(name.c_str(), std::ifstream::in); + } + + /* search relative files in the path */ + for (auto const& path_elm : surf_path) { + std::string buff = path_elm + FILE_DELIM + name; + fs->open(buff.c_str(), std::ifstream::in); + + if (not fs->fail()) { + XBT_DEBUG("Found file at %s", buff.c_str()); + return fs; + } + } + + return fs; +} + FILE *surf_fopen(const char *name, const char *mode) { - unsigned int cpt; - char *path_elm = nullptr; - char *buff; FILE *file = nullptr; xbt_assert(name); @@ -138,10 +160,9 @@ FILE *surf_fopen(const char *name, const char *mode) return fopen(name, mode); /* search relative files in the path */ - xbt_dynar_foreach(surf_path, cpt, path_elm) { - buff = bprintf("%s" FILE_DELIM "%s", path_elm, name); - file = fopen(buff, mode); - free(buff); + for (auto const& path_elm : surf_path) { + std::string buff = path_elm + FILE_DELIM + name; + file = fopen(buff.c_str(), mode); if (file) return file; @@ -174,7 +195,7 @@ const char *__surf_get_initial_path() unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); char root[4] = { 0 }; - if (!len) + if (not len) return nullptr; strncpy(root, current_directory, 3); @@ -218,20 +239,18 @@ void model_help(const char *category, s_surf_model_description_t * table) printf(" %s: %s\n", table[i].name, table[i].description); } -int find_model_description(s_surf_model_description_t * table, - const char *name) +int find_model_description(s_surf_model_description_t* table, const char* name) { - int i; - char *name_list = nullptr; - - for (i = 0; table[i].name; i++) - if (!strcmp(name, table[i].name)) { + for (int i = 0; table[i].name; i++) + if (not strcmp(name, table[i].name)) { return i; } - if (!table[0].name) + + if (not 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++) { + + char* name_list = xbt_strdup(table[0].name); + for (int i = 1; table[i].name; i++) { name_list = (char *) xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 3); strncat(name_list, ", ", 2); strncat(name_list, table[i].name, strlen(table[i].name)); @@ -240,36 +259,31 @@ int find_model_description(s_surf_model_description_t * table, return -1; } -static inline void surf_storage_free(void *r) +void sg_version_check(int lib_version_major, int lib_version_minor, int lib_version_patch) { - 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, + 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", + 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. Please fix this.\n", - lib_version_major,lib_version_minor,lib_version_patch, - SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,SIMGRID_VERSION_PATCH); + "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(); } - 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", - lib_version_major,lib_version_minor,lib_version_patch, - SIMGRID_VERSION_MAJOR,SIMGRID_VERSION_MINOR,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", + lib_version_major, lib_version_minor, lib_version_patch, SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, + SIMGRID_VERSION_PATCH); + } } void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch) @@ -284,31 +298,31 @@ void sg_version() std::printf("This program was linked against %s (git: %s), found in %s.\n", SIMGRID_VERSION_STRING, SIMGRID_GIT_VERSION, SIMGRID_INSTALL_PREFIX); -#if HAVE_MC +#if SIMGRID_HAVE_MC std::printf(" Model-checking support compiled in.\n"); #else std::printf(" Model-checking support disabled at compilation.\n"); #endif -#if HAVE_NS3 +#if SIMGRID_HAVE_NS3 std::printf(" NS3 support compiled in.\n"); #else std::printf(" NS3 support disabled at compilation.\n"); #endif -#if HAVE_JEDULE +#if SIMGRID_HAVE_JEDULE std::printf(" Jedule support compiled in.\n"); #else std::printf(" Jedule support disabled at compilation.\n"); #endif -#if HAVE_LUA +#if SIMGRID_HAVE_LUA std::printf(" Lua support compiled in.\n"); #else std::printf(" Lua support disabled at compilation.\n"); #endif -#if HAVE_MALLOCATOR +#if SIMGRID_HAVE_MALLOCATOR std::printf(" Mallocator support compiled in.\n"); #else std::printf(" Mallocator support disabled at compilation.\n"); @@ -329,23 +343,12 @@ void surf_init(int *argc, char **argv) XBT_DEBUG("Create all Libs"); USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr); - storage_lib = xbt_lib_new(); - storage_type_lib = xbt_lib_new(); - file_lib = xbt_lib_new(); - watched_hosts_lib = xbt_dict_new_homogeneous(nullptr); - - XBT_DEBUG("Add SURF levels"); - SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); - xbt_init(argc, argv); - if (!all_existing_models) + if (not all_existing_models) all_existing_models = new std::vector(); - if (!future_evt_set) + if (not 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); - sg_config_init(argc, argv); if (MC_is_active()) @@ -356,16 +359,19 @@ void surf_exit() { TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ - xbt_dynar_free(&surf_path); - sg_host_exit(); - 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); + for (auto const& e : storage_types) { + simgrid::surf::StorageType* stype = e.second; + delete stype->properties; + delete stype->model_properties; + delete stype; + } + for (auto const& s : *simgrid::surf::StorageImpl::storagesMap()) + delete s.second; + delete simgrid::surf::StorageImpl::storagesMap(); - for (auto model : *all_existing_models) + for (auto const& model : *all_existing_models) delete model; delete all_existing_models; @@ -376,10 +382,6 @@ void surf_exit() future_evt_set = nullptr; } -#if HAVE_THREAD_CONTEXTS - xbt_parmap_destroy(surf_parmap); -#endif - tmgr_finalize(); sg_platf_exit(); simgrid::s4u::Engine::shutdown(); @@ -428,14 +430,14 @@ double Model::nextOccuringEvent(double now) double Model::nextOccuringEventLazy(double now) { - XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size()); + XBT_DEBUG("Before share resources, the size of modified actions set is %zu", modifiedSet_->size()); lmm_solve(maxminSystem_); - XBT_DEBUG("After share resources, The size of modified actions set is %zd", modifiedSet_->size()); + XBT_DEBUG("After share resources, The size of modified actions set is %zu", modifiedSet_->size()); - while(!modifiedSet_->empty()) { + while (not modifiedSet_->empty()) { Action *action = &(modifiedSet_->front()); modifiedSet_->pop_front(); - int max_dur_flag = 0; + bool max_dur_flag = false; if (action->getStateSet() != runningActionSet_) continue; @@ -459,25 +461,24 @@ double Model::nextOccuringEventLazy(double now) min = now + time_to_completion; // when the task will complete if nothing changes } - if ((action->getMaxDuration() != NO_MAX_DURATION) && - (min == -1 || action->getStartTime() + action->getMaxDuration() < min)) { + if ((action->getMaxDuration() > NO_MAX_DURATION) && + (min <= -1 || action->getStartTime() + action->getMaxDuration() < min)) { // when the task will complete anyway because of the deadline if any min = action->getStartTime() + action->getMaxDuration(); - max_dur_flag = 1; + max_dur_flag = true; } - 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) { + if (min > -1) { 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; + 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 @@ -548,7 +549,7 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) namespace simgrid { namespace surf { -Resource::Resource(Model* model, const char* name, lmm_constraint_t constraint) +Resource::Resource(Model* model, const std::string& name, lmm_constraint_t constraint) : name_(name), model_(model), constraint_(constraint) {} @@ -558,7 +559,7 @@ bool Resource::isOn() const { return isOn_; } bool Resource::isOff() const { - return ! isOn_; + return not isOn_; } void Resource::turnOn() @@ -633,8 +634,10 @@ Action::~Action() { xbt_free(category_); } -void Action::finish() { - finishTime_ = surf_get_clock(); +void Action::finish(Action::State state) +{ + finishTime_ = surf_get_clock(); + setState(state); } Action::State Action::getState() @@ -685,7 +688,7 @@ void Action::setBound(double bound) if (variable_) lmm_update_variable_bound(getModel()->getMaxminSystem(), variable_, bound); - if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock()) + if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate() != surf_get_clock()) heapRemove(getModel()->getActionHeap()); XBT_OUT(); } @@ -698,7 +701,7 @@ double Action::getStartTime() double Action::getFinishTime() { /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */ - return remains_ == 0 ? finishTime_ : -1; + return remains_ <= 0 ? finishTime_ : -1; } void Action::setData(void* data) @@ -722,13 +725,11 @@ void Action::setMaxDuration(double duration) heapRemove(getModel()->getActionHeap()); } -void Action::gapRemove() {} - -void Action::setPriority(double priority) +void Action::setSharingWeight(double weight) { - XBT_IN("(%p,%g)", this, priority); - priority_ = priority; - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority); + XBT_IN("(%p,%g)", this, weight); + sharingWeight_ = weight; + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), weight); if (getModel()->getUpdateMechanism() == UM_LAZY) heapRemove(getModel()->getActionHeap()); @@ -746,7 +747,7 @@ void Action::cancel(){ int Action::unref(){ refcount_--; - if (!refcount_) { + if (not refcount_) { if (action_hook.is_linked()) stateSet_->erase(stateSet_->iterator_to(*this)); if (getVariable()) @@ -770,7 +771,8 @@ void Action::suspend() lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); if (getModel()->getUpdateMechanism() == UM_LAZY){ heapRemove(getModel()->getActionHeap()); - if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() && priority_ > 0){ + if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() && + sharingWeight_ > 0) { //If we have a lazy model, we need to update the remaining value accordingly updateRemainingLazy(surf_get_clock()); } @@ -784,7 +786,7 @@ void Action::resume() { XBT_IN("(%p)", this); if (suspended_ != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority_); + lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), sharingWeight_); suspended_ = 0; if (getModel()->getUpdateMechanism() == UM_LAZY) heapRemove(getModel()->getActionHeap()); @@ -846,58 +848,5 @@ double Action::getRemainsNoUpdate() return remains_; } -//FIXME split code in the right places -void Action::updateRemainingLazy(double now) -{ - double delta = 0.0; - - if(getModel() == surf_network_model) - { - if (suspended_ != 0) - return; - } - else - { - 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 - lastUpdate_; - - 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->cname(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_); - } - XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_); - } - - if(getModel() == surf_network_model) - { - if (maxDuration_ != NO_MAX_DURATION) - double_update(&maxDuration_, delta, sg_surf_precision); - - //FIXME: duplicated code - if ((remains_ <= 0) && - (lmm_get_variable_weight(getVariable()) > 0)) { - finish(); - setState(Action::State::done); - heapRemove(getModel()->getActionHeap()); - } else if (((maxDuration_ != NO_MAX_DURATION) - && (maxDuration_ <= 0))) { - finish(); - setState(Action::State::done); - heapRemove(getModel()->getActionHeap()); - } - } - - lastUpdate_ = now; - lastValue_ = lmm_variable_getvalue(getVariable()); -} - } }