[mc] this_actor, wait_for and wait_until

[simgrid.git] / examples / s4u / mutex / s4u_mutex.cpp

diff --git a/examples/s4u/mutex/s4u_mutex.cpp b/examples/s4u/mutex/s4u_mutex.cpp
index f1c0eb7..9910290 100644 (file)
--- a/examples/s4u/mutex/s4u_mutex.cpp
+++ b/examples/s4u/mutex/s4u_mutex.cpp
@@ -14,13 +14,13 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
 
-static void worker(simgrid::s4u::Mutex mutex, int& result)
+static void worker(simgrid::s4u::MutexPtr mutex, int& result)
 {
   // Do the calculation
   simgrid::s4u::this_actor::execute(1000);
 
   // lock the mutex before enter in the critical section
-  std::lock_guard<simgrid::s4u::Mutex> lock(mutex);
+  std::lock_guard<simgrid::s4u::Mutex> lock(*mutex);
   XBT_INFO("Hello s4u, I'm ready to compute");
 
   // And finaly add it to the results
@@ -28,12 +28,12 @@ static void worker(simgrid::s4u::Mutex mutex, int& result)
   XBT_INFO("I'm done, good bye");
 }
 
-static void workerLockGuard(simgrid::s4u::Mutex mutex, int& result)
+static void workerLockGuard(simgrid::s4u::MutexPtr mutex, int& result)
 {
   simgrid::s4u::this_actor::execute(1000);
 
   // Simply use the std::lock_guard like this
-  std::lock_guard<simgrid::s4u::Mutex> lock(mutex);
+  std::lock_guard<simgrid::s4u::Mutex> lock(*mutex);
 
   // then you are in a safe zone
   XBT_INFO("Hello s4u, I'm ready to compute");
@@ -45,22 +45,17 @@ static void workerLockGuard(simgrid::s4u::Mutex mutex, int& result)
 static void master()
 {
   int result = 0;
-  simgrid::s4u::Mutex mutex;
-  simgrid::s4u::Actor workers[NB_ACTOR*2];
+  simgrid::s4u::MutexPtr mutex = simgrid::s4u::Mutex::createMutex();
 
   for (int i = 0; i < NB_ACTOR * 2 ; i++) {
     // To create a worker use the static method simgrid::s4u::Actor.
     if((i % 2) == 0 )
-      workers[i] = simgrid::s4u::Actor("worker",
-        simgrid::s4u::Host::by_name("Jupiter"),
-        workerLockGuard, mutex, std::ref(result));
+      simgrid::s4u::Actor::createActor("worker", simgrid::s4u::Host::by_name("Jupiter"),  workerLockGuard, mutex, std::ref(result));
     else
-      workers[i] = simgrid::s4u::Actor("worker",
-        simgrid::s4u::Host::by_name("Tremblay"),
-        worker, mutex, std::ref(result));
+      simgrid::s4u::Actor::createActor("worker", simgrid::s4u::Host::by_name("Tremblay"), worker,          mutex, std::ref(result));
   }
 
-  simgrid::s4u::this_actor::sleep(10);
+  simgrid::s4u::this_actor::sleep_for(10);
   XBT_INFO("Results is -> %d", result);
 }
 
@@ -68,7 +63,7 @@ int main(int argc, char **argv)
 {
   simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);
   e->loadPlatform("../../platforms/two_hosts.xml");
-  simgrid::s4u::Actor("main", simgrid::s4u::Host::by_name("Tremblay"), master);
+  simgrid::s4u::Actor::createActor("main", simgrid::s4u::Host::by_name("Tremblay"), master);
   e->run();
   return 0;
 }