/* 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 "simgrid/Exception.hpp"
-#include "simgrid/actor.h"
-#include "simgrid/modelchecker.h"
-#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/Exec.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/VirtualMachine.hpp"
+#include <simgrid/Exception.hpp>
+#include <simgrid/actor.h>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Actor.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Exec.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+
#include "src/include/mc/mc.h"
#include "src/kernel/EngineImpl.hpp"
-#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/HostImpl.hpp"
#include <algorithm>
-#include <sstream>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_actor, s4u, "S4U actors");
return this->pimpl_->is_daemon();
}
+bool Actor::is_maestro()
+{
+ const auto* self = kernel::actor::ActorImpl::self();
+ return self == nullptr || kernel::EngineImpl::get_instance()->is_maestro(self);
+}
+
const simgrid::xbt::string& Actor::get_name() const
{
return this->pimpl_->get_name();
*/
bool is_maestro()
{
- return SIMIX_is_maestro();
+ return Actor::is_maestro();
}
void sleep_for(double duration)
simgrid::s4u::Actor::self()->set_data(userdata);
}
-void* sg_actor_self_data() // XBT_ATTRIB_DEPRECATED_v330
-{
- return sg_actor_self_get_data();
-}
-
-void sg_actor_self_data_set(void* userdata) // XBT_ATTRIB_DEPRECATED_v330
-{
- sg_actor_self_set_data(userdata);
-}
-
sg_actor_t sg_actor_self()
{
return simgrid::s4u::Actor::self();
}
-void sg_actor_self_execute(double flops) // XBT_ATTRIB_DEPRECATED_v330
-{
- simgrid::s4u::this_actor::execute(flops);
-}
-
void sg_actor_execute(double flops)
{
simgrid::s4u::this_actor::execute(flops);
actor->set_data(userdata);
}
-void* sg_actor_data(const_sg_actor_t actor) // XBT_ATTRIB_DEPRECATED_v330
-{
- return sg_actor_get_data(actor);
-}
-
-void sg_actor_data_set(sg_actor_t actor, void* userdata) // XBT_ATTRIB_DEPRECATED_v330
-{
- sg_actor_set_data(actor, userdata);
-}
-
/** @brief Add a function to the list of "on_exit" functions for the current actor.
* The on_exit functions are the functions executed when your actor is killed.
* You should use them to free the data used by your actor.