/* 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 <vector>
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
{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},
}
}
-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
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<simgrid::kernel::routing::NetCard*>(p);
- });
-
XBT_DEBUG("Add SURF levels");
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_storage_free);
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);
delete model;
delete all_existing_models;
xbt_dynar_free(&model_list_invoke);
- routing_exit();
simgrid::surf::surfExitCallbacks();
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)
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size());
lmm_solve(maxminSystem_);
}
}
-double Model::next_occuring_event_full(double /*now*/) {
- return shareResourcesMaxMin(getRunningActionSet(), maxminSystem_, lmm_solve);
-}
-
-double shareResourcesMaxMin(ActionList *runningActions, lmm_system_t sys, void (*solve) (lmm_system_t))
-{
- solve(sys);
+double Model::nextOccuringEventFull(double /*now*/) {
+ maxminSystem_->solve_fun(maxminSystem_);
double min = -1;
- for(auto it(runningActions->begin()), itend(runningActions->end()); it != itend ; ++it) {
+ for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) {
Action *action = &*it;
double value = lmm_variable_getvalue(action->getVariable());
if (value > 0) {
void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)
{
- THROW_UNIMPLEMENTED;
+ THROW_UNIMPLEMENTED;
}
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_;
}
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 {
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
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_);
}
void Action::setCategory(const char *category)
{
- XBT_IN("(%p,%s)", this, category);
category_ = xbt_strdup(category);
- XBT_OUT();
}
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() {}
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();
}
