/* */
/* This is somehow the "libc" of SimGrid */
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */
/* 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/kernel/activity/IoImpl.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/checker/SimcallObserver.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "xbt/random.hpp"
#include "popping_bodies.cpp"
* @ingroup simix_synchro_management
*
*/
-void simcall_mutex_lock(smx_mutex_t mutex)
+void simcall_mutex_lock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331
{
- simcall_BODY_mutex_lock(mutex);
+ mutex->mutex().lock();
}
/**
* @ingroup simix_synchro_management
*
*/
-int simcall_mutex_trylock(smx_mutex_t mutex)
+int simcall_mutex_trylock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331
{
- return simcall_BODY_mutex_trylock(mutex);
+ return mutex->mutex().try_lock();
}
/**
* @ingroup simix_synchro_management
*
*/
-void simcall_mutex_unlock(smx_mutex_t mutex)
+void simcall_mutex_unlock(smx_mutex_t mutex) // XBT_ATTRIB_DEPRECATD_v331
{
- simcall_BODY_mutex_unlock(mutex);
+ mutex->mutex().unlock();
}
/**
return simgrid::kernel::actor::simcall([io] { return io->test(); });
}
-void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallInspector* t)
+void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallObserver* t)
{
- simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = t;
simcall_BODY_run_kernel(&code);
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr;
}
-void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallInspector* t = nullptr)
+void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallObserver* t = nullptr)
{
- simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = t;
simcall_BODY_run_blocking(&code);
+ simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr;
}
-int simcall_mc_random(int min, int max) {
- return simcall_BODY_mc_random(min, max);
+int simcall_mc_random(int min, int max) // XBT_ATTRIB_DEPRECATD_v331
+{
+ return MC_random(min, max);
}
/* ************************************************************************** */