Merge get-pid

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index d5d5e99..1a97502 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -12,6 +12,8 @@
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/mailbox.hpp"
 
+#include "src/simix/smx_private.h"
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
 using namespace simgrid;
@@ -25,6 +27,15 @@ s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::funct
     killTime, nullptr, 0));
 }
 
+s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, const char* function, simgrid::xbt::args args)
+{
+  simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
+  simgrid::simix::ActorCode code = factory(std::move(args));
+  this->pimpl_ = SIMIX_process_ref(simcall_process_create(
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, nullptr, 0));
+}
+
 void s4u::Actor::join() {
   simcall_process_join(pimpl_, -1);
 }
@@ -68,6 +79,13 @@ void s4u::Actor::kill() {
   simcall_process_kill(pimpl_);
 }
 
+simgrid::s4u::Actor s4u::Actor::forPid(int pid)
+{
+  // Should we throw if we did not find it?
+  smx_process_t process = SIMIX_process_from_PID(pid);
+  return simgrid::s4u::Actor(process);
+}
+
 // static stuff:
 
 void s4u::Actor::killAll() {
@@ -104,6 +122,10 @@ void send(Mailbox &chan, void *payload, size_t simulatedSize) {
   c.wait();
 }
 
+int getPid() {
+  return simcall_process_get_PID(SIMIX_process_self());
+}
+
 }
 }
 }