Remove xbt::args: use vector<string> instead

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index a220c8c..0c8b49a 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -12,22 +12,34 @@
 #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;
 
-s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
-
 s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
 {
   // TODO, when autorestart is used, the std::function is copied so the new
   // instance will get a fresh (reinitialized) state. Is this what we want?
-  this->pimpl_ = simcall_process_create(
+  this->pimpl_ = SIMIX_process_ref(simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
-    killTime, NULL, 0);
+    killTime, nullptr, 0));
 }
 
-s4u::Actor::~Actor() {}
+s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime,
+  const char* function, std::vector<std::string> 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);
+}
 
 void s4u::Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(pimpl_,autorestart);
@@ -53,10 +65,28 @@ double s4u::Actor::getKillTime() {
   return simcall_process_get_kill_time(pimpl_);
 }
 
+void s4u::Actor::kill(int pid) {
+  msg_process_t process = SIMIX_process_from_PID(pid);
+  if(process != nullptr) {
+    simcall_process_kill(process);
+  } else {
+    std::ostringstream oss;
+    oss << "kill: ("<< pid <<") - No such process" << std::endl;
+    throw std::runtime_error(oss.str());
+  }
+}
+
 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() {
@@ -73,12 +103,12 @@ void sleep(double duration) {
 }
 
 e_smx_state_t execute(double flops) {
-  smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+  smx_synchro_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
   return simcall_execution_wait(s);
 }
 
 void* recv(Mailbox &chan) {
-  void *res = NULL;
+  void *res = nullptr;
   Comm c = Comm::recv_init(chan);
   c.setDstData(&res,sizeof(res));
   c.wait();
@@ -93,6 +123,10 @@ void send(Mailbox &chan, void *payload, size_t simulatedSize) {
   c.wait();
 }
 
+int getPid() {
+  return simcall_process_get_PID(SIMIX_process_self());
+}
+
 }
 }
 }