From: adfaure <adrien.faure2@gmail.com>
Date: Tue, 7 Jun 2016 07:52:20 +0000 (+0200)
Subject: [s4u] add actor join
X-Git-Tag: v3_14~1050
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/33271d843f695e0a2707dd29158165898db73477

[s4u] add actor join
---

diff --git a/include/simgrid/s4u/actor.hpp b/include/simgrid/s4u/actor.hpp
index e96a862a4b..f479cf5144 100644
--- a/include/simgrid/s4u/actor.hpp
+++ b/include/simgrid/s4u/actor.hpp
@@ -77,6 +77,11 @@ public:
 
   static void kill(int pid);
   
+  /**
+   * Wait for the actor to finish.
+   */ 
+  void join();
+  
   // Static methods on all actors:
 
   /** Ask kindly to all actors to die. Only the issuer will survive. */
diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 4a58590436..37302a75d8 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -29,6 +29,10 @@ s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::funct
 
 s4u::Actor::~Actor() {}
 
+void s4u::Actor::join() {
+  simcall_process_join(pimpl_, -1);
+}
+
 void s4u::Actor::setAutoRestart(bool autorestart) {
   simcall_process_auto_restart_set(pimpl_,autorestart);
 }