#include "src/instr/instr_private.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/mc/mc_replay.hpp"
-#include "surf/surf.hpp"
#include <algorithm>
#include <string>
if (MC_is_active() || MC_record_replay_is_active()) {
return MC_process_clock_get(kernel::actor::ActorImpl::self());
} else {
- return surf_get_clock();
+ return kernel::EngineImpl::get_clock();
}
}
pimpl->load_platform(platf);
}
-void Engine::register_function(const std::string& name, int (*code)(int, char**)) // XBT_ATTRIB_DEPRECATED_v330
-{
- 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_v330
-{
- register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
-}
-
/** Registers the main function of an actor that will be launched from the deployment file */
void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
{
}
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
{
{
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
-{
- return simgrid::s4u::Engine::get_instance()->get_actor_count();
-}
-
void simgrid_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32