#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+
+#include "../kernel/activity/IoImpl.hpp"
#include "simgrid/sg_config.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
-#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
- if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::None) {
+ if (smpi_enabled() && smpi_privatize_global_variables == SmpiPrivStrategies::NONE) {
#if HAVE_PRIVATIZATION
fprintf(stderr, "Try to enable SMPI variable privatization with --cfg=smpi/privatization:yes.\n");
#else
namespace simgrid {
namespace simix {
-simgrid::xbt::signal<void()> onDeadlock;
-
simgrid::config::Flag<double> breakpoint{"simix/breakpoint",
"When non-negative, raise a SIGTRAP after given (simulated) time", -1.0};
}
}
-static std::function<void()> maestro_code;
+static simgrid::simix::ActorCode maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
});
simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) {
- sg_storage_t s = simgrid::s4u::Storage::byName(storage.get_cname());
+ sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_cname());
xbt_assert(s != nullptr, "Storage not found for name %s", storage.get_cname());
});
}
do {
XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size());
- if (simgrid::simix::breakpoint >= 0.0 && time >= simgrid::simix::breakpoint) {
+ if (simgrid::simix::breakpoint >= 0.0 && surf_get_clock() >= simgrid::simix::breakpoint) {
XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get());
simgrid::simix::breakpoint = -1.0;
#ifdef SIGTRAP
XBT_DEBUG("### time %f, #processes %zu, #to_run %zu", time, simix_global->process_list.size(),
simix_global->process_to_run.size());
- if (simix_global->process_to_run.empty() && not simix_global->process_list.empty())
- simgrid::simix::onDeadlock();
-
} while (time > -1.0 || not simix_global->process_to_run.empty());
if (not simix_global->process_list.empty()) {
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
{
- smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::makeTask([callback, arg]() { callback(arg); }));
+ smx_timer_t timer = new s_smx_timer_t(date, simgrid::xbt::make_task([callback, arg]() { callback(arg); }));
timer->handle_ = simix_timers.emplace(std::make_pair(date, timer));
return timer;
}