X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e51c90b78469c7c2067935ef62bf9474d09891d..905e26b959375a249abcfdf1599f6178fe031f44:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 40a9c30519..68f66fd416 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -7,96 +7,156 @@
 #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"
 
+#include "src/simix/smx_private.h"
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
-static int s4u_actor_runner(int argc, char **argv)
+namespace simgrid {
+namespace s4u {
+
+// ***** Actor creation *****
+ActorPtr Actor::self()
 {
-  // Move the callback from the heap to the stack:
-  std::unique_ptr<std::function<int()>> code2 =
-    std::unique_ptr<std::function<int()>>(
-      static_cast<std::function<int()>*>(
-        SIMIX_process_self_get_data()));
-  std::function<int()> code = std::move(*code2);
-  code2 = nullptr;
-  // Call it:
-  // TODO, handle exceptions
-  return code();
+  smx_context_t self_context = SIMIX_context_self();
+  if (self_context == nullptr)
+    return simgrid::s4u::ActorPtr();
+
+  return simgrid::s4u::ActorPtr(&self_context->process()->actor());
 }
 
-using namespace simgrid;
 
-s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
+ActorPtr Actor::createActor(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?
+  smx_process_t process = simcall_process_create(
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, nullptr, 0);
+  return Ptr(&process->actor());
+}
 
-s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<int()> code)
+ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
+  const char* function, std::vector<std::string> args)
 {
-  std::function<int()>* code2 = new std::function<int()>(std::move(code));
-  this->pimpl_ = simcall_process_create(
-    name, s4u_actor_runner, code2, host->name().c_str(),
-    killTime, 0, NULL, NULL, 0);
+  simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
+  simgrid::simix::ActorCode code = factory(std::move(args));
+  smx_process_t process = simcall_process_create(
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, nullptr, 0);
+  return ActorPtr(&process->actor());
 }
 
-s4u::Actor::~Actor() {}
+// ***** Actor methods *****
+
+void Actor::join() {
+  simcall_process_join(pimpl_, -1);
+}
 
-void s4u::Actor::setAutoRestart(bool autorestart) {
+void Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(pimpl_,autorestart);
 }
 
-s4u::Host *s4u::Actor::getHost() {
-  return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
+s4u::Host *Actor::getHost() {
+  return pimpl_->host;
 }
 
-const char* s4u::Actor::getName() {
-  return simcall_process_get_name(pimpl_);
+simgrid::xbt::string Actor::getName() {
+  return pimpl_->name;
 }
 
-int s4u::Actor::getPid(){
-  return simcall_process_get_PID(pimpl_);
+int Actor::getPid(){
+  return pimpl_->pid;
 }
 
-void s4u::Actor::setKillTime(double time) {
+void Actor::setKillTime(double time) {
   simcall_process_set_kill_time(pimpl_,time);
 }
 
-double s4u::Actor::getKillTime() {
+double Actor::getKillTime() {
   return simcall_process_get_kill_time(pimpl_);
 }
 
-void s4u::Actor::kill() {
+void 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());
+  }
+}
+
+smx_process_t Actor::getImpl() {
+  return pimpl_;
+}
+
+void Actor::kill() {
   simcall_process_kill(pimpl_);
 }
 
-// static stuff:
+// ***** Static functions *****
+
+ActorPtr Actor::forPid(int pid)
+{
+  smx_process_t process = SIMIX_process_from_PID(pid);
+  if (process != nullptr)
+    return ActorPtr(&process->actor());
+  else
+    return nullptr;
+}
 
-void s4u::Actor::killAll() {
+void Actor::killAll() {
   simcall_process_killall(1);
 }
 
-void s4u::Actor::sleep(double duration) {
-  simcall_process_sleep(duration);
+// ***** this_actor *****
+
+namespace this_actor {
+
+void sleep_for(double duration)
+{
+  if (duration > 0)
+    simcall_process_sleep(duration);
+}
+
+XBT_PUBLIC(void) sleep_until(double timeout)
+{
+  double now = SIMIX_get_clock();
+  if (timeout > now)
+    simcall_process_sleep(timeout - now);
 }
 
-e_smx_state_t s4u::Actor::execute(double flops) {
-  smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+e_smx_state_t execute(double flops) {
+  smx_synchro_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
   return simcall_execution_wait(s);
 }
 
-void *s4u::Actor::recv(Mailbox &chan) {
-  void *res = NULL;
-  Comm c = Comm::recv_init(chan);
+void* recv(Mailbox &chan) {
+  void *res = nullptr;
+  Comm& c = Comm::recv_init(chan);
   c.setDstData(&res,sizeof(res));
   c.wait();
   return res;
 }
 
-void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) {
-  Comm c = Comm::send_init(chan);
+void send(Mailbox &chan, void *payload, size_t simulatedSize) {
+  Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
   // c.start() is optional.
   c.wait();
 }
+
+int getPid() {
+  return SIMIX_process_self()->pid;
+}
+
+}
+}
+}