Rename smx_process to ActorImpl

[simgrid.git] / src / s4u / s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 24a6bb8..6db4d97 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -20,6 +20,15 @@ namespace simgrid {
 namespace s4u {
 
 // ***** Actor creation *****
+ActorPtr Actor::self()
+{
+  smx_context_t self_context = SIMIX_context_self();
+  if (self_context == nullptr)
+    return simgrid::s4u::ActorPtr();
+
+  return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+}
+
 
 ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
 {
@@ -28,7 +37,7 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
   smx_process_t process = simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
     killTime, nullptr, 0);
-  return Ptr(&process->actor());
+  return Ptr(&process->getIface());
 }
 
 ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
@@ -39,7 +48,7 @@ ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
   smx_process_t process = simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
     killTime, nullptr, 0);
-  return ActorPtr(&process->actor());
+  return ActorPtr(&process->getIface());
 }
 
 // ***** Actor methods *****
@@ -53,15 +62,15 @@ void Actor::setAutoRestart(bool autorestart) {
 }
 
 s4u::Host *Actor::getHost() {
-  return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
+  return pimpl_->host;
 }
 
-const char* Actor::getName() {
-  return simcall_process_get_name(pimpl_);
+simgrid::xbt::string Actor::getName() {
+  return pimpl_->name;
 }
 
 int Actor::getPid(){
-  return simcall_process_get_PID(pimpl_);
+  return pimpl_->pid;
 }
 
 void Actor::setKillTime(double time) {
@@ -97,7 +106,7 @@ ActorPtr Actor::forPid(int pid)
 {
   smx_process_t process = SIMIX_process_from_PID(pid);
   if (process != nullptr)
-    return ActorPtr(&process->actor());
+    return ActorPtr(&process->getIface());
   else
     return nullptr;
 }
@@ -145,7 +154,7 @@ void send(Mailbox &chan, void *payload, size_t simulatedSize) {
 }
 
 int getPid() {
-  return simcall_process_get_PID(SIMIX_process_self());
+  return SIMIX_process_self()->pid;
 }
 
 }