X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b356ce9a510410f879eb3cd1b16b33856aebfdbe..9ea179ce187f56df358fc6f69c3e721b330df272:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 58de67d35d..f16cabf607 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -13,7 +13,7 @@
 
 #include "src/kernel/context/Context.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
 
 namespace simgrid {
 namespace s4u {
@@ -25,27 +25,21 @@ ActorPtr Actor::self()
   if (self_context == nullptr)
     return simgrid::s4u::ActorPtr();
 
-  return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+  return self_context->process()->iface();
 }
 
-
-ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, 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_actor_t process = simcall_process_create(
-    name, std::move(code), nullptr, host, killTime, nullptr, 0);
-  return ActorPtr(&process->getIface());
+  smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  return actor->iface();
 }
 
-ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
-  const char* function, std::vector<std::string> args)
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, 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_actor_t process = simcall_process_create(
-    name, std::move(code), nullptr, host, killTime, nullptr, 0);
-  return ActorPtr(&process->getIface());
+  smx_actor_t actor                         = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  return actor->iface();
 }
 
 // ***** Actor methods *****
@@ -58,11 +52,26 @@ void Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(pimpl_,autorestart);
 }
 
+void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data)
+{
+  simcall_process_on_exit(pimpl_, fun, data);
+}
+
+void Actor::migrate(Host* new_host)
+{
+  simcall_process_set_host(pimpl_, new_host);
+}
+
 s4u::Host* Actor::host()
 {
   return this->pimpl_->host;
 }
 
+const char* Actor::cname()
+{
+  return this->pimpl_->name.c_str();
+}
+
 simgrid::xbt::string Actor::name()
 {
   return this->pimpl_->name;
@@ -78,6 +87,21 @@ int Actor::ppid()
   return this->pimpl_->ppid;
 }
 
+void Actor::suspend()
+{
+  simcall_process_suspend(pimpl_);
+}
+
+void Actor::resume()
+{
+  simcall_process_resume(pimpl_);
+}
+
+int Actor::isSuspended()
+{
+  return simcall_process_is_suspended(pimpl_);
+}
+
 void Actor::setKillTime(double time) {
   simcall_process_set_kill_time(pimpl_,time);
 }
@@ -88,7 +112,7 @@ double Actor::killTime()
 }
 
 void Actor::kill(int pid) {
-  msg_process_t process = SIMIX_process_from_PID(pid);
+  smx_actor_t process = SIMIX_process_from_PID(pid);
   if(process != nullptr) {
     simcall_process_kill(process);
   } else {
@@ -112,15 +136,21 @@ ActorPtr Actor::byPid(int pid)
 {
   smx_actor_t process = SIMIX_process_from_PID(pid);
   if (process != nullptr)
-    return ActorPtr(&process->getIface());
+    return process->iface();
   else
-    return nullptr;
+    return ActorPtr();
 }
 
-void Actor::killAll() {
+void Actor::killAll()
+{
   simcall_process_killall(1);
 }
 
+void Actor::killAll(int resetPid)
+{
+  simcall_process_killall(resetPid);
+}
+
 // ***** this_actor *****
 
 namespace this_actor {
@@ -151,7 +181,8 @@ void* recv(MailboxPtr chan) {
   return res;
 }
 
-void send(MailboxPtr chan, void *payload, size_t simulatedSize) {
+void send(MailboxPtr chan, void* payload, double simulatedSize)
+{
   Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
@@ -169,6 +200,45 @@ int ppid()
   return SIMIX_process_self()->ppid;
 }
 
+std::string name()
+{
+  return SIMIX_process_self()->name;
+}
+
+Host* host()
+{
+  return SIMIX_process_self()->host;
+}
+
+void suspend()
+{
+  simcall_process_suspend(SIMIX_process_self());
+}
+
+void resume()
+{
+  simcall_process_resume(SIMIX_process_self());
+}
+
+int isSuspended()
+{
+  return simcall_process_is_suspended(SIMIX_process_self());
+}
+
+void kill()
+{
+  simcall_process_kill(SIMIX_process_self());
+}
+
+void onExit(int_f_pvoid_pvoid_t fun, void* data)
+{
+  simcall_process_on_exit(SIMIX_process_self(), fun, data);
+}
+
+void migrate(Host* new_host)
+{
+  simcall_process_set_host(SIMIX_process_self(), new_host);
+}
 }
 }
 }