X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7163c15e9d6a0def3a8eaeedacd5d76894a51bd..30d088f255192e7dde37bf961570af5b1c1db153:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 50107a3e56..7c3d2d5ad0 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "surf_interface.hpp" -#include "VirtualMachineImpl.hpp" #include "cpu_interface.hpp" #include "mc/mc.h" #include "network_interface.hpp" @@ -13,10 +12,10 @@ #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 "surf_routing.hpp" #include XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); @@ -100,11 +99,6 @@ s_surf_model_description_t surf_host_model_description[] = { {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}, - {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).", nullptr}, {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", nullptr}, @@ -281,12 +275,54 @@ 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 (USER_HOST_LEVEL != -1) // Already initialized @@ -295,18 +331,11 @@ void surf_init(int *argc, char **argv) XBT_DEBUG("Create all Libs"); 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"); SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free); @@ -334,7 +363,6 @@ void surf_exit() xbt_dynar_free(&surf_path); sg_host_exit(); - xbt_lib_free(&as_router_lib); xbt_lib_free(&storage_lib); sg_link_exit(); xbt_lib_free(&storage_type_lib); @@ -345,7 +373,6 @@ void surf_exit() delete model; delete all_existing_models; xbt_dynar_free(&model_list_invoke); - routing_exit(); simgrid::surf::surfExitCallbacks(); @@ -528,15 +555,11 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) namespace simgrid { namespace surf { -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() { - free(name_); -} +Resource::~Resource() = default; bool Resource::isOn() const { return isOn_; @@ -560,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 { @@ -595,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 @@ -611,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_); } @@ -700,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(){ @@ -711,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() {} @@ -764,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(); }