X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/198b09ec16ca1b8fc05053bcae9e75c0ad689711..e85fd815f2a40f200482bef6f7217e7bc1e45a67:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 4ff30eddad..3f6b63d7a1 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -4,19 +4,19 @@ /* 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 "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 "network_interface.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/simix/smx_host_private.h" +#include "src/surf/HostImpl.hpp" +#include "surf_private.h" +#include "surf_routing.hpp" +#include XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -27,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 = nullptr; /* to destroy models correctly */ +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 = nullptr; -xbt_dynar_t host_that_restart = xbt_dynar_new(sizeof(char*), nullptr); +std::vector host_that_restart; xbt_dict_t watched_hosts_lib; namespace simgrid { @@ -46,49 +46,61 @@ 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}, + {"Energy", "Cpu energy consumption.", &sg_energy_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}, + &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}, + &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}, + &surf_network_model_init_SMPI}, {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", - surf_network_model_init_IB}, + &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}, -#if HAVE_NS3 - {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3}, -#endif + &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}, + &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}, + &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}, + &surf_network_model_init_Vegas}, {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; +#if ! HAVE_SMPI +void surf_network_model_init_SMPI() { + xbt_die("Please activate SMPI support in cmake to use the SMPI network model."); +} +void surf_network_model_init_IB() { + xbt_die("Please activate SMPI support in cmake to use the IB network model."); +} +#endif +#if !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."); +} +#endif + 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}, {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}, + {"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}, {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}, + {"default", "Default vm model.", &surf_vm_model_init_HL13}, {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; @@ -100,7 +112,7 @@ s_surf_model_description_t surf_optimization_mode_description[] = { }; 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}, {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */ }; @@ -110,7 +122,7 @@ static xbt_parmap_t surf_parmap = nullptr; /* parallel map on models */ double NOW = 0; -double surf_get_clock(void) +double surf_get_clock() { return NOW; } @@ -161,7 +173,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 @@ -246,16 +258,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); } } @@ -267,15 +288,10 @@ 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 + if (USER_HOST_LEVEL != -1) // 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(nullptr); as_router_lib = xbt_lib_new(); @@ -287,16 +303,15 @@ void surf_init(int *argc, char **argv) XBT_DEBUG("Add routing levels"); 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); + delete static_cast(p); }); XBT_DEBUG("Add SURF levels"); - 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(simgrid::surf::Model*), nullptr); + all_existing_models = new std::vector(); if (!model_list_invoke) model_list_invoke = xbt_dynar_new(sizeof(simgrid::surf::Model*), nullptr); if (!future_evt_set) @@ -311,20 +326,13 @@ void surf_init(int *argc, char **argv) MC_memory_init(); } -void surf_exit(void) +void surf_exit() { - unsigned int iter; - simgrid::surf::Model *model = nullptr; - - 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(); - - xbt_dynar_free(&host_that_restart); xbt_dynar_free(&surf_path); - xbt_dict_free(&host_list); + sg_host_exit(); xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); sg_link_exit(); @@ -332,9 +340,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(); @@ -384,35 +392,25 @@ Model::~Model(){ delete doneActionSet_; } -double Model::next_occuring_event(double now) +double Model::nextOccuringEvent(double now) { //FIXME: set the good function once and for all if (updateMechanism_ == UM_LAZY) - return next_occuring_event_lazy(now); + return nextOccuringEventLazy(now); else if (updateMechanism_ == UM_FULL) - return next_occuring_event_full(now); + return nextOccuringEventFull(now); else xbt_die("Invalid cpu update mechanism!"); } -double Model::next_occuring_event_lazy(double now) +double Model::nextOccuringEventLazy(double now) { - Action *action = nullptr; - double min = -1; - double share; - - 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 %zd", 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 %zd", modifiedSet_->size()); while(!modifiedSet_->empty()) { - action = &(modifiedSet_->front()); + Action *action = &(modifiedSet_->front()); modifiedSet_->pop_front(); int max_dur_flag = 0; @@ -425,8 +423,8 @@ double Model::next_occuring_event_lazy(double now) action->updateRemainingLazy(now); - min = -1; - share = lmm_variable_getvalue(action->getVariable()); + double min = -1; + double share = lmm_variable_getvalue(action->getVariable()); if (share > 0) { double time_to_completion; @@ -462,67 +460,34 @@ double Model::next_occuring_event_lazy(double now) } //hereafter must have already the min value for this resource model - if (xbt_heap_size(actionHeap_) > 0) - min = xbt_heap_maxkey(actionHeap_) - now; - else - min = -1; - - XBT_DEBUG("The minimum with the HEAP %f", min); - - return min; + 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::next_occuring_event_full(double /*now*/) { - THROW_UNIMPLEMENTED; - return 0.0; -} +double Model::nextOccuringEventFull(double /*now*/) { + maxminSystem_->solve_fun(maxminSystem_); -double Model::shareResourcesMaxMin(ActionList *running_actions, - lmm_system_t sys, - void (*solve) (lmm_system_t)) -{ - Action *action = nullptr; double min = -1; - double value = -1; - - solve(sys); - - ActionList::iterator it(running_actions->begin()), itend(running_actions->end()); - for(; it != itend ; ++it) { - action = &*it; - value = lmm_variable_getvalue(action->getVariable()); - if ((value > 0) || (action->getMaxDuration() >= 0)) - break; - } - - if (!action) - return -1.0; - - if (value > 0) { - if (action->getRemains() > 0) - min = action->getRemainsNoUpdate() / value; - else - min = 0.0; - if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) - min = action->getMaxDuration(); - } else - min = action->getMaxDuration(); - - - for (++it; it != itend; ++it) { - action = &*it; - value = lmm_variable_getvalue(action->getVariable()); + 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 (value < min) { + if (min < 0 || value < min) { min = value; XBT_DEBUG("Updating min (value) with %p: %f", action, min); } } - if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) { + if ((action->getMaxDuration() >= 0) && (min<0 || action->getMaxDuration() < min)) { min = action->getMaxDuration(); XBT_DEBUG("Updating min (duration) with %p: %f", action, min); } @@ -535,16 +500,16 @@ double Model::shareResourcesMaxMin(ActionList *running_actions, void Model::updateActionsState(double now, double delta) { if (updateMechanism_ == UM_FULL) - updateActionsStateFull(now, delta); + updateActionsStateFull(now, delta); else if (updateMechanism_ == UM_LAZY) - updateActionsStateLazy(now, delta); + updateActionsStateLazy(now, delta); else - xbt_die("Invalid cpu update mechanism!"); + xbt_die("Invalid cpu update mechanism!"); } void Model::updateActionsStateLazy(double /*now*/, double /*delta*/) { - THROW_UNIMPLEMENTED; + THROW_UNIMPLEMENTED; } void Model::updateActionsStateFull(double /*now*/, double /*delta*/) @@ -562,20 +527,11 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) namespace simgrid { namespace surf { -Resource::Resource(Model *model, const char *name) - : name_(xbt_strdup(name)) - , model_(model) -{} - -Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint) - : name_(xbt_strdup(name)) - , model_(model) - , constraint_(constraint) +Resource::Resource(Model* model, const char* name, lmm_constraint_t constraint) + : name_(name), model_(model), constraint_(constraint) {} -Resource::~Resource() { - xbt_free((void*)name_); -} +Resource::~Resource() = default; bool Resource::isOn() const { return isOn_; @@ -599,11 +555,11 @@ Model *Resource::getModel() const { } const char *Resource::getName() const { - return name_; + return name_.c_str(); } bool Resource::operator==(const Resource &other) const { - return strcmp(name_, other.name_); + return name_ == other.name_; } lmm_constraint_t Resource::getConstraint() const { @@ -634,14 +590,13 @@ void surf_action_lmm_update_index_heap(void *action, int i) { namespace simgrid { namespace surf { -void Action::initialize(simgrid::surf::Model *model, double cost, bool failed, - lmm_variable_t var) +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) { - remains_ = cost; - start_ = surf_get_clock(); - cost_ = cost; - model_ = model; - variable_ = var; if (failed) stateSet_ = getModel()->getFailedActionSet(); else @@ -650,16 +605,6 @@ void Action::initialize(simgrid::surf::Model *model, double cost, bool failed, stateSet_->push_back(*this); } -Action::Action(simgrid::surf::Model *model, double cost, bool failed) -{ - initialize(model, cost, failed); -} - -Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) -{ - initialize(model, cost, failed, var); -} - Action::~Action() { xbt_free(category_); } @@ -739,9 +684,7 @@ void Action::setData(void* data) void Action::setCategory(const char *category) { - XBT_IN("(%p,%s)", this, category); category_ = xbt_strdup(category); - XBT_OUT(); } void Action::ref(){ @@ -750,11 +693,9 @@ void Action::ref(){ void Action::setMaxDuration(double duration) { - XBT_IN("(%p,%g)", this, duration); maxDuration_ = duration; if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap heapRemove(getModel()->getActionHeap()); - XBT_OUT(); } void Action::gapRemove() {} @@ -803,9 +744,14 @@ void Action::suspend() XBT_IN("(%p)", this); if (suspended_ != 2) { lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - suspended_ = 1; - if (getModel()->getUpdateMechanism() == UM_LAZY) + if (getModel()->getUpdateMechanism() == UM_LAZY){ heapRemove(getModel()->getActionHeap()); + if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() && priority_ > 0){ + //If we have a lazy model, we need to update the remaining value accordingly + updateRemainingLazy(surf_get_clock()); + } + } + suspended_ = 1; } XBT_OUT(); }