use c++ strings for s4u::Actor names

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index c53f54a..5ea9f88 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -7,7 +7,7 @@
 #include "xbt/log.h"
 #include "src/msg/msg_private.h"
 
-#include "simgrid/s4u/actor.hpp"
+#include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/mailbox.hpp"
@@ -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()->actor());
+}
+
 
 ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
 {
@@ -53,11 +62,11 @@ 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(){
@@ -83,7 +92,7 @@ void Actor::kill(int pid) {
   }
 }
 
-smx_process_t Actor::getInferior() {
+smx_process_t Actor::getImpl() {
   return pimpl_;
 }