/* 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 <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Engine.hpp>
+
#include "mc/mc.h"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/kernel/routing/NetZoneImpl.hpp"
-#include "simgrid/s4u/Disk.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Mailbox.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/simix.h"
#include "src/instr/instr_private.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
-#include <boost/algorithm/string/predicate.hpp>
-#include <simgrid/Exception.hpp>
#include <algorithm>
-#include <dlfcn.h>
#include <string>
XBT_LOG_NEW_CATEGORY(s4u, "Log channels of the S4U (Simgrid for you) interface");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engine)");
+static simgrid::kernel::actor::ActorCode maestro_code;
+
namespace simgrid {
namespace s4u {
xbt::signal<void()> Engine::on_platform_creation;
xbt::signal<void(double)> Engine::on_time_advance;
xbt::signal<void(void)> Engine::on_deadlock;
-Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
+Engine* Engine::instance_ = nullptr; /* This singleton is awful, but I don't see no other solution right now. */
void Engine::initialize(int* argc, char** argv)
{
xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
Engine::instance_ = this;
instr::init();
- SIMIX_global_init(argc, argv);
+ pimpl->initialize(argc, argv);
+ // Either create a new context with maestro or create
+ // a context object with the current context maestro):
+ kernel::actor::create_maestro(maestro_code);
}
Engine::Engine(std::string name) : pimpl(new kernel::EngineImpl())
Engine::~Engine()
{
- delete pimpl;
+ kernel::EngineImpl::shutdown();
Engine::instance_ = nullptr;
}
/** @brief Retrieve the engine singleton */
Engine* Engine::get_instance()
+{
+ return get_instance(nullptr, nullptr);
+}
+Engine* Engine::get_instance(int* argc, char** argv)
{
if (Engine::instance_ == nullptr) {
- auto e = new Engine(nullptr, nullptr);
+ auto e = new Engine(argc, argv);
xbt_assert(Engine::instance_ == e);
}
return Engine::instance_;
void Engine::shutdown()
{
delete Engine::instance_;
- Engine::instance_ = nullptr;
}
double Engine::get_clock()
{
if (MC_is_active() || MC_record_replay_is_active()) {
- return MC_process_clock_get(SIMIX_process_self());
+ return MC_process_clock_get(kernel::actor::ActorImpl::self());
} else {
- return surf_get_clock();
+ return kernel::EngineImpl::get_clock();
}
}
void Engine::add_model(std::shared_ptr<kernel::resource::Model> model,
const std::vector<kernel::resource::Model*>& dependencies)
{
- simgrid::kernel::actor::simcall([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); });
+ kernel::actor::simcall([this, &model, &dependencies] { pimpl->add_model(std::move(model), dependencies); });
}
const std::vector<simgrid::kernel::resource::Model*>& Engine::get_all_models() const
*/
void Engine::load_platform(const std::string& platf) const
{
- double start = xbt_os_time();
- if (boost::algorithm::ends_with(platf, ".so")) {
- void* handle = dlopen(platf.c_str(), RTLD_LAZY);
- xbt_assert(handle, "Impossible to open platform file: %s", platf.c_str());
- typedef void (*load_fct_t)(const Engine&);
- dlerror();
- load_fct_t callable = (load_fct_t)dlsym(handle, "load_platform");
- const char* dlsym_error = dlerror();
- xbt_assert(not dlsym_error, "Error: %s", dlsym_error);
- callable(*this);
- dlclose(handle);
- } else {
- parse_platform_file(platf);
- }
-
- double end = xbt_os_time();
- XBT_DEBUG("PARSE TIME: %g", (end - start));
-}
-
-void Engine::register_function(const std::string& name, int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329
-{
- kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
- return xbt::wrap_main(code, std::move(args));
- };
- register_function(name, code_factory);
-}
-void Engine::register_default(int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v329
-{
- register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+ pimpl->load_platform(platf);
}
/** Registers the main function of an actor that will be launched from the deployment file */
return link->second->get_iface();
}
+SplitDuplexLink* Engine::split_duplex_link_by_name(const std::string& name) const
+{
+ auto link = pimpl->split_duplex_links_.find(name);
+ if (link == pimpl->split_duplex_links_.end())
+ throw std::invalid_argument(std::string("Link not found: ") + name);
+ return link->second->get_iface();
+}
+
/** @brief Find a link from its name (or nullptr if that link does not exist) */
Link* Engine::link_by_name_or_null(const std::string& name) const
{
}
void Engine::run() const
+{
+ run_until(-1);
+}
+void Engine::run_until(double max_date) const
{
/* sealing resources before run: links */
for (auto* link : get_all_links())
if (MC_is_active()) {
MC_run();
} else {
- pimpl->run();
+ pimpl->run(max_date);
}
}
+void Engine::track_vetoed_activities(std::set<Activity*>* vetoed_activities) const
+{
+ Activity::set_vetoed_activities(vetoed_activities);
+}
+
/** @brief Retrieve the root netzone, containing all others */
s4u::NetZone* Engine::get_netzone_root() const
{
config::set_value(name.c_str(), value);
}
+Engine* Engine::set_default_comm_data_copy_callback(void (*callback)(kernel::activity::CommImpl*, void*, size_t))
+{
+ kernel::activity::CommImpl::set_copy_data_callback(callback);
+ return this;
+}
+
} // namespace s4u
} // namespace simgrid
+double SIMIX_get_clock() // XBT_ATTRIB_DEPRECATED_v332
+{
+ return simgrid::s4u::Engine::get_clock();
+}
+
/* **************************** Public C interface *************************** */
void simgrid_init(int* argc, char** argv)
{
- simgrid::s4u::Engine e(argc, argv);
+ static simgrid::s4u::Engine e(argc, argv);
}
void simgrid_load_platform(const char* file)
{
{
simgrid::s4u::Engine::get_instance()->run();
}
+void simgrid_run_until(double max_date)
+{
+ simgrid::s4u::Engine::get_instance()->run_until(max_date);
+}
void simgrid_register_function(const char* name, void (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_function(name, code);
return simgrid::s4u::Engine::get_clock();
}
-int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330
+void simgrid_set_maestro(void (*code)(void*), void* data)
+{
+#ifdef _WIN32
+ XBT_WARN("simgrid_set_maestro is believed to not work on windows. Please help us investigating this issue if "
+ "you need that feature");
+#endif
+ maestro_code = std::bind(code, data);
+}
+void SIMIX_set_maestro(void (*code)(void*), void* data) // XBT_ATTRIB_DEPRECATED_v333
{
- return simgrid::s4u::Engine::get_instance()->get_actor_count();
+ simgrid_set_maestro(code, data);
}
