add send with timeout and irecv to this_actor API

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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 16479c0..570c181 100644 (file)
--- 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 {
@@ -52,6 +52,11 @@ 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);
@@ -92,6 +97,11 @@ 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);
 }
@@ -131,10 +141,16 @@ ActorPtr Actor::byPid(int pid)
     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 {
@@ -174,6 +190,25 @@ void send(MailboxPtr chan, void* payload, double simulatedSize)
   c.wait();
 }
 
+void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
+{
+  Comm& c = Comm::send_init(chan);
+  c.setRemains(simulatedSize);
+  c.setSrcData(payload);
+  // c.start() is optional.
+  c.wait(timeout);
+}
+
+Comm& isend(MailboxPtr chan, void* payload, double simulatedSize)
+{
+  return Comm::send_async(chan, payload, simulatedSize);
+}
+
+Comm& isend(MailboxPtr chan, void** data)
+{
+  return Comm::recv_async(chan, data);
+}
+
 int pid()
 {
   return SIMIX_process_self()->pid;
@@ -204,6 +239,21 @@ 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);