#include <simgrid/modelchecker.h>
#include <simgrid/s4u/Engine.hpp>
+#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
+#include <simgrid/simix.h>
+
#include "mc/mc.h"
#include "src/instr/instr_private.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/mc/mc_replay.hpp"
+#include "xbt/config.hpp"
#include <algorithm>
#include <string>
namespace s4u {
xbt::signal<void()> Engine::on_platform_creation;
xbt::signal<void()> Engine::on_platform_created;
+xbt::signal<void()> Engine::on_simulation_start;
xbt::signal<void()> Engine::on_simulation_end;
xbt::signal<void(double)> Engine::on_time_advance;
xbt::signal<void(void)> Engine::on_deadlock;
}
void Engine::run_until(double max_date) const
{
+ static bool callback_called = false;
+ if (not callback_called) {
+ on_simulation_start();
+ callback_called = true;
+ }
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- if (MC_is_active()) {
- MC_run();
- } else {
- pimpl->run(max_date);
- }
+ pimpl->run(max_date);
}
void Engine::track_vetoed_activities(std::set<Activity*>* vetoed_activities) const
config::set_value(name.c_str(), value);
}
-Engine* Engine::set_default_comm_data_copy_callback(void (*callback)(kernel::activity::CommImpl*, void*, size_t))
+Engine* Engine::set_default_comm_data_copy_callback(
+ const std::function<void(kernel::activity::CommImpl*, void*, size_t)>& callback)
{
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)
{