X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5792a3bf76ce15a573ae5e9c63097595ae5f2bd..a976ff26ca5afba53350d9ed449c122b52972824:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index d5e7d0230a..c85eba3fef 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -6,15 +6,19 @@ #include "surf_interface.hpp" #include "mc/mc.h" #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/kernel/routing/NetPoint.hpp" +#include "simgrid/sg_config.hpp" +#include "src/internal_config.h" #include "src/surf/HostImpl.hpp" +#include "src/surf/xml/platf.hpp" +#include "surf/surf.hpp" +#include "xbt/module.h" #include -#include #include -#include + +#ifdef _WIN32 +#include +#endif XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -23,7 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke * Utils * *********/ -std::vector * all_existing_models = nullptr; /* to destroy models correctly */ +std::vector* all_existing_models = nullptr; /* to destroy models correctly */ simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr; std::vector surf_path; @@ -32,15 +36,8 @@ std::vector host_that_restart; std::set watched_hosts; extern std::map storage_types; -namespace simgrid { -namespace surf { - -simgrid::xbt::signal surfExitCallbacks; -} -} - -#include // FIXME: this plugin should not be linked to the core -#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}, @@ -122,23 +119,17 @@ double surf_get_clock() return NOW; } -#ifdef _WIN32 -# define FILE_DELIM "\\" -#else -# define FILE_DELIM "/" /* FIXME: move to better location */ -#endif - -std::ifstream* surf_ifsopen(const char* name) +std::ifstream* surf_ifsopen(std::string name) { std::ifstream* fs = new std::ifstream(); - xbt_assert(name); - if (__surf_is_absolute_file_path(name)) { /* don't mess with absolute file names */ - fs->open(name, std::ifstream::in); + 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 path_elm : surf_path) { - std::string buff = path_elm + FILE_DELIM + name; + for (auto const& path_elm : surf_path) { + std::string buff = path_elm + "/" + name; fs->open(buff.c_str(), std::ifstream::in); if (not fs->fail()) { @@ -149,6 +140,7 @@ std::ifstream* surf_ifsopen(const char* name) return fs; } + FILE *surf_fopen(const char *name, const char *mode) { FILE *file = nullptr; @@ -159,8 +151,8 @@ FILE *surf_fopen(const char *name, const char *mode) return fopen(name, mode); /* search relative files in the path */ - for (auto path_elm : surf_path) { - std::string buff = path_elm + FILE_DELIM + name; + for (auto const& path_elm : surf_path) { + std::string buff = path_elm + "/" + name; file = fopen(buff.c_str(), mode); if (file) @@ -169,47 +161,6 @@ FILE *surf_fopen(const char *name, const char *mode) return nullptr; } -#ifdef _WIN32 -#include -#define MAX_DRIVE 26 -static const char *disk_drives_letter_table[MAX_DRIVE] = { - "A:\\","B:\\","C:\\","D:\\","E:\\","F:\\","G:\\","H:\\","I:\\","J:\\","K:\\","L:\\","M:\\", - "N:\\","O:\\","P:\\","Q:\\","R:\\","S:\\","T:\\","U:\\","V:\\","W:\\","X:\\","Y:\\","Z:\\" -}; -#endif - -/* - * Returns the initial path. On Windows the initial path is - * the current directory for the current process in the other - * case the function returns "./" that represents the current - * directory on Unix/Linux platforms. - */ - -const char *__surf_get_initial_path() -{ - -#ifdef _WIN32 - unsigned i; - char current_directory[MAX_PATH + 1] = { 0 }; - unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory); - char root[4] = { 0 }; - - if (not len) - return nullptr; - - strncpy(root, current_directory, 3); - - for (i = 0; i < MAX_DRIVE; i++) { - if (toupper(root[0]) == disk_drives_letter_table[i][0]) - return disk_drives_letter_table[i]; - } - - return nullptr; -#else - return "./"; -#endif -} - /* The __surf_is_absolute_file_path() returns 1 if * file_path is a absolute file path, in the other * case the function returns 0. @@ -238,23 +189,20 @@ 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, std::string name) { for (int i = 0; table[i].name; i++) - if (not strcmp(name, table[i].name)) { + if (name == table[i].name) return i; - } if (not table[0].name) xbt_die("No model is valid! This is a bug."); - 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)); - } - xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); + std::string name_list = std::string(table[0].name); + for (int i = 1; table[i].name; i++) + name_list = name_list + ", " + table[i].name; + + xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str()); return -1; } @@ -344,7 +292,7 @@ void surf_init(int *argc, char **argv) xbt_init(argc, argv); if (not all_existing_models) - all_existing_models = new std::vector(); + all_existing_models = new std::vector(); if (not future_evt_set) future_evt_set = new simgrid::trace_mgr::future_evt_set(); @@ -356,538 +304,24 @@ void surf_init(int *argc, char **argv) void surf_exit() { - TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ - - sg_host_exit(); + simgrid::s4u::Engine::shutdown(); sg_link_exit(); - for (auto e : storage_types) { + for (auto const& e : storage_types) { simgrid::surf::StorageType* stype = e.second; delete stype->properties; delete stype->model_properties; delete stype; } - for (auto 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; - simgrid::surf::surfExitCallbacks(); - - if (future_evt_set) { - delete future_evt_set; - future_evt_set = nullptr; - } + delete future_evt_set; + future_evt_set = nullptr; tmgr_finalize(); sg_platf_exit(); - simgrid::s4u::Engine::shutdown(); NOW = 0; /* Just in case the user plans to restart the simulation afterward */ } - -/********* - * Model * - *********/ - -namespace simgrid { -namespace surf { - -Model::Model() - : maxminSystem_(nullptr) -{ - readyActionSet_ = new ActionList(); - runningActionSet_ = new ActionList(); - failedActionSet_ = new ActionList(); - doneActionSet_ = new ActionList(); - - modifiedSet_ = nullptr; - actionHeap_ = nullptr; - updateMechanism_ = UM_UNDEFINED; - selectiveUpdate_ = 0; -} - -Model::~Model(){ - delete readyActionSet_; - delete runningActionSet_; - delete failedActionSet_; - delete doneActionSet_; -} - -double Model::nextOccuringEvent(double now) -{ - //FIXME: set the good function once and for all - if (updateMechanism_ == UM_LAZY) - return nextOccuringEventLazy(now); - else if (updateMechanism_ == UM_FULL) - return nextOccuringEventFull(now); - else - xbt_die("Invalid cpu update mechanism!"); -} - -double Model::nextOccuringEventLazy(double now) -{ - 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 %zu", modifiedSet_->size()); - - while (not modifiedSet_->empty()) { - Action *action = &(modifiedSet_->front()); - modifiedSet_->pop_front(); - bool max_dur_flag = false; - - if (action->getStateSet() != runningActionSet_) - continue; - - /* bogus priority, skip it */ - if (action->getPriority() <= 0 || action->getHat()==LATENCY) - continue; - - action->updateRemainingLazy(now); - - double min = -1; - double share = lmm_variable_getvalue(action->getVariable()); - - if (share > 0) { - double time_to_completion; - if (action->getRemains() > 0) { - time_to_completion = action->getRemainsNoUpdate() / share; - } else { - time_to_completion = 0.0; - } - 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)) { - // when the task will complete anyway because of the deadline if any - min = action->getStartTime() + action->getMaxDuration(); - 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) { - 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(actionHeap_) > 0) { - double min = xbt_heap_maxkey(actionHeap_) - now; - XBT_DEBUG("minimum with the HEAP %f", min); - return min; - } else { - XBT_DEBUG("The HEAP is empty, thus returning -1"); - return -1; - } -} - -double Model::nextOccuringEventFull(double /*now*/) { - maxminSystem_->solve_fun(maxminSystem_); - - double min = -1; - for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) { - Action *action = &*it; - double value = lmm_variable_getvalue(action->getVariable()); - if (value > 0) { - if (action->getRemains() > 0) - value = action->getRemainsNoUpdate() / value; - else - value = 0.0; - if (min < 0 || value < min) { - min = value; - XBT_DEBUG("Updating min (value) with %p: %f", action, min); - } - } - if ((action->getMaxDuration() >= 0) && (min<0 || action->getMaxDuration() < min)) { - min = action->getMaxDuration(); - XBT_DEBUG("Updating min (duration) with %p: %f", action, min); - } - } - XBT_DEBUG("min value : %f", min); - - return min; -} - -void Model::updateActionsState(double now, double delta) -{ - if (updateMechanism_ == UM_FULL) - updateActionsStateFull(now, delta); - else if (updateMechanism_ == UM_LAZY) - updateActionsStateLazy(now, delta); - else - xbt_die("Invalid cpu update mechanism!"); -} - -void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) -{ - THROW_UNIMPLEMENTED; -} - -void Model::updateActionsStateFull(double /*now*/, double /*delta*/) -{ - THROW_UNIMPLEMENTED; -} - -} -} - -/************ - * Resource * - ************/ - -namespace simgrid { -namespace surf { - -Resource::Resource(Model* model, const char* name, lmm_constraint_t constraint) - : name_(name), model_(model), constraint_(constraint) -{} - -Resource::~Resource() = default; - -bool Resource::isOn() const { - return isOn_; -} -bool Resource::isOff() const { - return not isOn_; -} - -void Resource::turnOn() -{ - isOn_ = true; -} - -void Resource::turnOff() -{ - isOn_ = false; -} - -Model* Resource::model() const -{ - return model_; -} - -const char* Resource::cname() const -{ - return name_.c_str(); -} - -bool Resource::operator==(const Resource &other) const { - return name_ == other.name_; -} - -lmm_constraint_t Resource::constraint() const -{ - return constraint_; -} - -} -} - -/********** - * Action * - **********/ - -const char *surf_action_state_names[6] = { - "SURF_ACTION_READY", - "SURF_ACTION_RUNNING", - "SURF_ACTION_FAILED", - "SURF_ACTION_DONE", - "SURF_ACTION_TO_FREE", - "SURF_ACTION_NOT_IN_THE_SYSTEM" -}; - -/* 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 { - -Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr) -{ -} - -Action::Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var) - : remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var) -{ - if (failed) - stateSet_ = getModel()->getFailedActionSet(); - else - stateSet_ = getModel()->getRunningActionSet(); - - stateSet_->push_back(*this); -} - -Action::~Action() { - xbt_free(category_); -} - -void Action::finish() { - finishTime_ = surf_get_clock(); -} - -Action::State Action::getState() -{ - if (stateSet_ == model_->getReadyActionSet()) - return Action::State::ready; - if (stateSet_ == model_->getRunningActionSet()) - return Action::State::running; - if (stateSet_ == model_->getFailedActionSet()) - return Action::State::failed; - if (stateSet_ == model_->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_ = model_->getReadyActionSet(); - break; - case Action::State::running: - stateSet_ = model_->getRunningActionSet(); - break; - case Action::State::failed: - stateSet_ = model_->getFailedActionSet(); - break; - case Action::State::done: - stateSet_ = model_->getDoneActionSet(); - break; - default: - stateSet_ = nullptr; - break; - } - if (stateSet_) - stateSet_->push_back(*this); -} - -double Action::getBound() -{ - return (variable_) ? lmm_variable_getbound(variable_) : 0; -} - -void Action::setBound(double bound) -{ - XBT_IN("(%p,%g)", this, bound); - if (variable_) - lmm_update_variable_bound(getModel()->getMaxminSystem(), variable_, bound); - - if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate() != surf_get_clock()) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); -} - -double Action::getStartTime() -{ - return start_; -} - -double Action::getFinishTime() -{ - /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */ - return remains_ <= 0 ? finishTime_ : -1; -} - -void Action::setData(void* data) -{ - data_ = data; -} - -void Action::setCategory(const char *category) -{ - category_ = xbt_strdup(category); -} - -void Action::ref(){ - refcount_++; -} - -void Action::setMaxDuration(double duration) -{ - maxDuration_ = duration; - if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap - heapRemove(getModel()->getActionHeap()); -} - -void Action::setSharingWeight(double weight) -{ - XBT_IN("(%p,%g)", this, weight); - sharingWeight_ = weight; - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), weight); - - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); -} - -void Action::cancel(){ - setState(Action::State::failed); - if (getModel()->getUpdateMechanism() == UM_LAZY) { - if (action_lmm_hook.is_linked()) - getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); - heapRemove(getModel()->getActionHeap()); - } -} - -int Action::unref(){ - refcount_--; - if (not refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); - if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); - if (getModel()->getUpdateMechanism() == UM_LAZY) { - /* remove from heap */ - heapRemove(getModel()->getActionHeap()); - if (action_lmm_hook.is_linked()) - getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this)); - } - delete this; - return 1; - } - return 0; -} - -void Action::suspend() -{ - XBT_IN("(%p)", this); - if (suspended_ != 2) { - 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() && - sharingWeight_ > 0) { - //If we have a lazy model, we need to update the remaining value accordingly - updateRemainingLazy(surf_get_clock()); - } - } - suspended_ = 1; - } - XBT_OUT(); -} - -void Action::resume() -{ - XBT_IN("(%p)", this); - if (suspended_ != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), sharingWeight_); - suspended_ = 0; - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - } - XBT_OUT(); -} - -bool Action::isSuspended() -{ - 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: - * - * NORMAL = this is a normal heap entry stating the date to finish transmitting - * LATENCY = this is a heap entry to warn us when the latency is payed - * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached - */ -void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat) -{ - hat_ = hat; - xbt_heap_push(heap, this, key); -} - -void Action::heapRemove(xbt_heap_t heap) -{ - hat_ = NOTSET; - if (indexHeap_ >= 0) { - xbt_heap_remove(heap, indexHeap_); - } -} - -void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat) -{ - hat_ = hat; - if (indexHeap_ >= 0) { - xbt_heap_update(heap, indexHeap_, key); - }else{ - xbt_heap_push(heap, this, key); - } -} - -void Action::updateIndexHeap(int i) { - indexHeap_ = i; -} - -double Action::getRemains() -{ - XBT_IN("(%p)", this); - /* update remains before return it */ - if (getModel()->getUpdateMechanism() == UM_LAZY) /* update remains before return it */ - updateRemainingLazy(surf_get_clock()); - XBT_OUT(); - return remains_; -} - -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(sharingWeight_ > 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)) || - ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) { - finish(); - setState(Action::State::done); - heapRemove(getModel()->getActionHeap()); - } - } - - lastUpdate_ = now; - lastValue_ = lmm_variable_getvalue(getVariable()); -} - -} -}