#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SemaphoreImpl.hpp"
-#include "src/mc/checker/SimcallObserver.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "xbt/random.hpp"
#include "popping_bodies.cpp"
+#include <boost/core/demangle.hpp>
+#include <string>
+#include <typeinfo>
+
/**
* @ingroup simix_host_management
* @brief Waits for the completion of an execution synchro and destroy it.
unsigned int simcall_execution_waitany_for(simgrid::kernel::activity::ExecImpl* execs[], size_t count,
double timeout) // XBT_ATTRIB_DEPRECATED_v331
{
- std::vector<simgrid::kernel::activity::ExecImpl*> execsv(execs, execs + count);
+ std::vector<simgrid::kernel::activity::ExecImpl*> execs_vec(execs, execs + count);
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
- simgrid::mc::ExecutionWaitanySimcall observer{issuer, &execsv, timeout};
+ simgrid::kernel::actor::ExecutionWaitanySimcall observer{issuer, execs_vec, timeout};
return simgrid::kernel::actor::simcall_blocking(
[&observer] {
simgrid::kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(),
&observer);
}
-void simcall_process_join(smx_actor_t process, double timeout) // XBT_ATTRIB_DEPRECATED_v328
-{
- simgrid::kernel::actor::ActorImpl::self()->join(process, timeout);
-}
-
-void simcall_process_suspend(smx_actor_t process) // XBT_ATTRIB_DEPRECATED_v328
-{
- process->get_iface()->suspend();
-}
-
simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB_DEPRECATED_v329
{
simgrid::kernel::actor::ActorImpl::self()->sleep(duration);
std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
- return simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout);
+ return static_cast<unsigned int>(simcall_BODY_comm_waitany(rcomms.data(), rcomms.size(), timeout));
}
-unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
+ssize_t simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
{
return simcall_BODY_comm_waitany(comms, count, timeout);
}
std::transform(comms, comms + count, begin(rcomms), [](const simgrid::kernel::activity::ActivityImplPtr& comm) {
return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
});
- return simcall_BODY_comm_testany(rcomms.data(), rcomms.size());
+ return static_cast<int>(simcall_BODY_comm_testany(rcomms.data(), rcomms.size()));
}
-int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count)
+ssize_t simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count)
{
if (count == 0)
return -1;
return simgrid::kernel::actor::simcall([io] { return io->test(); });
}
-void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallObserver* observer)
+void simcall_run_kernel(std::function<void()> const& code, simgrid::kernel::actor::SimcallObserver* observer)
{
simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer;
simcall_BODY_run_kernel(&code);
simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = nullptr;
}
-void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallObserver* observer)
+void simcall_run_blocking(std::function<void()> const& code, simgrid::kernel::actor::SimcallObserver* observer)
{
simgrid::kernel::actor::ActorImpl::self()->simcall_.observer_ = observer;
simcall_BODY_run_blocking(&code);
/* ************************************************************************** */
/** @brief returns a printable string representing a simcall */
-const char* SIMIX_simcall_name(Simcall kind)
-{
- return simcall_names[static_cast<int>(kind)];
+const char* SIMIX_simcall_name(const s_smx_simcall& simcall)
+{
+ if (simcall.observer_ != nullptr) {
+ static std::string name;
+ name = boost::core::demangle(typeid(*simcall.observer_).name());
+ const char* cname = name.c_str();
+ if (name.rfind("simgrid::kernel::", 0) == 0)
+ cname += 17; // strip prefix "simgrid::kernel::"
+ return cname;
+ } else {
+ return simcall_names[static_cast<int>(simcall.call_)];
+ }
}
namespace simgrid {