X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59251ff676c562b79573e3561166e4351e4ad11e..d236809e6149a03ef3e53599458f51c98f79f94d:/src/s4u/s4u_Actor.cpp

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 77b3806315..bc9956a428 100644
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2022. 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. */
@@ -170,6 +170,12 @@ bool Actor::is_daemon() const
   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();
@@ -285,7 +291,7 @@ namespace this_actor {
  */
 bool is_maestro()
 {
-  return SIMIX_is_maestro();
+  return Actor::is_maestro();
 }
 
 void sleep_for(double duration)
@@ -531,21 +537,6 @@ sg_actor_t sg_actor_by_pid(aid_t pid)
   return simgrid::s4u::Actor::by_pid(pid).get();
 }
 
-aid_t sg_actor_get_PID(const_sg_actor_t actor) // XBT_ATTRIB_DEPRECATED_v331
-{
-  return sg_actor_get_pid(actor);
-}
-
-aid_t sg_actor_get_PPID(const_sg_actor_t actor) // XBT_ATTRIB_DEPRECATED_v331
-{
-  return sg_actor_get_ppid(actor);
-}
-
-sg_actor_t sg_actor_by_PID(aid_t pid) // XBT_ATTRIB_DEPRECATED_v331
-{
-  return sg_actor_by_pid(pid);
-}
-
 /** @brief Return the name of an actor. */
 const char* sg_actor_get_name(const_sg_actor_t actor)
 {
@@ -750,7 +741,7 @@ const char* sg_actor_self_get_name()
 
 void* sg_actor_self_get_data()
 {
-  return simgrid::s4u::Actor::self()->get_data();
+  return simgrid::s4u::Actor::self()->get_data<void>();
 }
 
 void sg_actor_self_set_data(void* userdata)
@@ -758,26 +749,11 @@ void sg_actor_self_set_data(void* userdata)
   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);
@@ -814,7 +790,7 @@ void sg_actor_unref(const_sg_actor_t actor)
 /** @brief Return the user data of a #sg_actor_t */
 void* sg_actor_get_data(const_sg_actor_t actor)
 {
-  return actor->get_data();
+  return actor->get_data<void>();
 }
 
 /** @brief Set the user data of a #sg_actor_t */
@@ -823,16 +799,6 @@ void sg_actor_set_data(sg_actor_t actor, void* userdata)
   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.