X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fd0a2b6cf055692f936e29294496d14a6091ff1..831de10adaaf8910940aa280e2ac2dd075b5ffe5:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 5cec45afd9..24a6bb8c3d 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -7,53 +7,72 @@
 #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");
 
-using namespace simgrid;
+namespace simgrid {
+namespace s4u {
+
+// ***** Actor creation *****
 
-s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
+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?
-  this->pimpl_ = SIMIX_process_ref(simcall_process_create(
+  smx_process_t process = simcall_process_create(
     name, std::move(code), nullptr, host->name().c_str(),
-    killTime, nullptr, 0));
+    killTime, nullptr, 0);
+  return Ptr(&process->actor());
 }
 
-void s4u::Actor::join() {
+ActorPtr Actor::createActor(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));
+  smx_process_t process = simcall_process_create(
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, nullptr, 0);
+  return ActorPtr(&process->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() {
+s4u::Host *Actor::getHost() {
   return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
 }
 
-const char* s4u::Actor::getName() {
+const char* Actor::getName() {
   return simcall_process_get_name(pimpl_);
 }
 
-int s4u::Actor::getPid(){
+int Actor::getPid(){
   return simcall_process_get_PID(pimpl_);
 }
 
-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(int pid) {
+void Actor::kill(int pid) {
   msg_process_t process = SIMIX_process_from_PID(pid);
   if(process != nullptr) {
     simcall_process_kill(process);
@@ -64,30 +83,44 @@ void s4u::Actor::kill(int pid) {
   }
 }
 
-void s4u::Actor::kill() {
+smx_process_t Actor::getImpl() {
+  return pimpl_;
+}
+
+void Actor::kill() {
   simcall_process_kill(pimpl_);
 }
 
-simgrid::s4u::Actor s4u::Actor::forPid(int pid)
+// ***** Static functions *****
+
+ActorPtr 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);
+  if (process != nullptr)
+    return ActorPtr(&process->actor());
+  else
+    return nullptr;
 }
 
-// static stuff:
-
-void s4u::Actor::killAll() {
+void Actor::killAll() {
   simcall_process_killall(1);
 }
 
+// ***** this_actor *****
 
-namespace simgrid {
-namespace s4u {
 namespace this_actor {
 
-void sleep(double duration) {
-  simcall_process_sleep(duration);
+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 execute(double flops) {
@@ -97,20 +130,24 @@ e_smx_state_t execute(double flops) {
 
 void* recv(Mailbox &chan) {
   void *res = nullptr;
-  Comm c = Comm::recv_init(chan);
+  Comm& c = Comm::recv_init(chan);
   c.setDstData(&res,sizeof(res));
   c.wait();
   return res;
 }
 
 void send(Mailbox &chan, void *payload, size_t simulatedSize) {
-  Comm c = Comm::send_init(chan);
+  Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
   // c.start() is optional.
   c.wait();
 }
 
+int getPid() {
+  return simcall_process_get_PID(SIMIX_process_self());
+}
+
 }
 }
 }