X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/728a1c266d918708c40045c08980ef68ce696833..30d088f255192e7dde37bf961570af5b1c1db153:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 87287951b7..7c3d2d5ad0 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -4,19 +4,18 @@ /* 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/kernel/routing/NetCard.hpp" +#include "src/simix/smx_host_private.h" +#include "src/surf/HostImpl.hpp" +#include "surf_private.h" #include XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); @@ -33,7 +32,7 @@ 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; -std::vector host_that_restart; +std::vector host_that_restart; xbt_dict_t watched_hosts_lib; namespace simgrid { @@ -47,49 +46,56 @@ 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}, - {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 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 */ }; @@ -101,7 +107,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 */ }; @@ -269,39 +275,68 @@ void sg_version_check(int lib_version_major,int lib_version_minor,int lib_versio } } -void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { +void sg_version_get(int* ver_major, int* ver_minor, int* ver_patch) +{ *ver_major = SIMGRID_VERSION_MAJOR; *ver_minor = SIMGRID_VERSION_MINOR; *ver_patch = SIMGRID_VERSION_PATCH; } +void sg_version() +{ + std::printf("This program was linked against %s\n", SIMGRID_VERSION_STRING); + +#if HAVE_MC + std::printf(" Model-checking support compiled in.\n"); +#else + std::printf(" Model-checking support disabled at compilation.\n"); +#endif + +#if HAVE_NS3 + std::printf(" NS3 support compiled in.\n"); +#else + std::printf(" NS3 support disabled at compilation.\n"); +#endif + +#if HAVE_JEDULE + std::printf(" Jedule support compiled in.\n"); +#else + std::printf(" Jedule support disabled at compilation.\n"); +#endif + +#if HAVE_LUA + std::printf(" Lua support compiled in.\n"); +#else + std::printf(" Lua support disabled at compilation.\n"); +#endif + +#if HAVE_MALLOCATOR + std::printf(" Mallocator support compiled in.\n"); +#else + std::printf(" Mallocator support disabled at compilation.\n"); +#endif + + std::printf("\nTo cite SimGrid in a publication, please use:\n" + " Henri Casanova, Arnaud Giersch, Arnaud Legrand, Martin Quinson, Frédéric Suter. \n" + " Versatile, Scalable, and Accurate Simulation of Distributed Applications and Platforms. \n" + " Journal of Parallel and Distributed Computing, Elsevier, 2014, 74 (10), pp.2899-2917.\n"); + std::printf("The pdf file and a BibTeX entry for LaTeX users can be found at http://hal.inria.fr/hal-01017319\n"); +} + 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(); 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 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); - }); - 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); @@ -325,12 +360,9 @@ void surf_exit() { 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(&surf_path); - xbt_dict_free(&host_list); - xbt_lib_free(&as_router_lib); + sg_host_exit(); xbt_lib_free(&storage_lib); sg_link_exit(); xbt_lib_free(&storage_type_lib); @@ -341,7 +373,6 @@ void surf_exit() delete model; delete all_existing_models; xbt_dynar_free(&model_list_invoke); - routing_exit(); simgrid::surf::surfExitCallbacks(); @@ -389,35 +420,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; @@ -430,8 +451,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; @@ -467,67 +488,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); } @@ -540,16 +528,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*/) @@ -567,20 +555,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_(name), model_(model), constraint_(constraint) {} -Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint) - : name_(xbt_strdup(name)) - , model_(model) - , constraint_(constraint) -{} - -Resource::~Resource() { - xbt_free((void*)name_); -} +Resource::~Resource() = default; bool Resource::isOn() const { return isOn_; @@ -604,11 +583,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 { @@ -639,14 +618,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 @@ -655,16 +633,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_); } @@ -744,9 +712,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(){ @@ -755,11 +721,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() {} @@ -808,9 +772,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(); }