Cosmetics around deprecated functions.

[simgrid.git] / src / kernel / actor / ActorImpl.cpp

diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index c70843f..149fa63 100644 (file)
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -16,7 +16,9 @@
 #include "src/mc/mc_replay.hpp"
 #include "src/mc/remote/AppSide.hpp"
 #include "src/simix/smx_private.hpp"
+#if HAVE_SMPI
 #include "src/smpi/include/private.hpp"
+#endif
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 
@@ -97,7 +99,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h
 
   auto* actor = new ActorImpl(xbt::string(name), host);
   /* Actor data */
-  actor->set_user_data(data);
+  actor->piface_.set_data(data);
   actor->code_ = nullptr;
 
   XBT_VERB("Create context %s", actor->get_cname());
@@ -308,8 +310,10 @@ void ActorImpl::yield()
     }
   }
 
+#if HAVE_SMPI
   if (not finished_)
     smpi_switch_data_segment(get_iface());
+#endif
 }
 
 /** This actor will be terminated automatically when the last non-daemon actor finishes */
@@ -496,7 +500,7 @@ ActorImplPtr ActorImpl::create(const std::string& name, const ActorCode& code, v
     actor = self()->init(xbt::string(name), host);
 
   /* actor data */
-  actor->set_user_data(data);
+  actor->piface_.set_data(data);
 
   actor->start(code);
 
@@ -529,17 +533,13 @@ int SIMIX_process_count() // XBT_ATTRIB_DEPRECATED_v329
 
 void* SIMIX_process_self_get_data() // XBT_ATTRIB_DEPRECATED_v329
 {
-  smx_actor_t self = simgrid::kernel::actor::ActorImpl::self();
-
-  if (self == nullptr) {
-    return nullptr;
-  }
-  return self->get_user_data();
+  simgrid::s4u::Actor* self = simgrid::s4u::Actor::self();
+  return self ? self->get_data() : nullptr;
 }
 
 void SIMIX_process_self_set_data(void* data) // XBT_ATTRIB_DEPRECATED_v329
 {
-  simgrid::kernel::actor::ActorImpl::self()->set_user_data(data);
+  simgrid::s4u::Actor::self()->set_data(data);
 }
 
 /* needs to be public and without simcall because it is called
@@ -550,7 +550,7 @@ const char* SIMIX_process_self_get_name()
 }
 
 /** @brief Returns the process from PID. */
-smx_actor_t SIMIX_process_from_PID(aid_t pid)
+smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATD_v331
 {
   return simgrid::kernel::actor::ActorImpl::by_pid(pid);
 }
@@ -564,5 +564,5 @@ void SIMIX_process_on_exit(smx_actor_t actor,
 
 void simcall_process_set_data(smx_actor_t process, void* data) // XBT_ATTRIB_DEPRECATED_v329
 {
-  simgrid::kernel::actor::simcall([process, data] { process->set_user_data(data); });
+  simgrid::kernel::actor::simcall([process, data] { process->get_ciface()->set_data(data); });
 }