use MSG_bar instead of xbt_mutex in this example

diff --git a/examples/msg/process-migration/process-migration.c b/examples/msg/process-migration/process-migration.c
index 31f6a36..e34e950 100644 (file)
--- a/examples/msg/process-migration/process-migration.c
+++ b/examples/msg/process-migration/process-migration.c
@@ -1,15 +1,13 @@
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */

 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/msg.h"
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/msg.h"

-#include "xbt/synchro.h"

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_process_migration, "Messages specific for this msg example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_process_migration, "Messages specific for this msg example");
 

-xbt_mutex_t checkpoint = NULL;
-xbt_cond_t identification = NULL;
+msg_bar_t barrier;

 static msg_process_t controlled_process = NULL;
 
 /* The Emigrant process will be moved from host to host. */
 static msg_process_t controlled_process = NULL;
 
 /* The Emigrant process will be moved from host to host. */


@@ -27,10 +25,8 @@ static int emigrant(int argc, char *argv[])
   MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Jacquelin")); /* - Move back to original location */
   MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));    /* - Go back to the other host to sleep*/
   MSG_process_sleep(4);
   MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Jacquelin")); /* - Move back to original location */
   MSG_process_migrate(MSG_process_self(), MSG_host_by_name("Boivin"));    /* - Go back to the other host to sleep*/
   MSG_process_sleep(4);

-  xbt_mutex_acquire(checkpoint);                                          /* - Get controlled at checkpoint */
-  controlled_process = MSG_process_self();                                /* - and get moved back by the policeman process */
-  xbt_cond_broadcast(identification);
-  xbt_mutex_release(checkpoint);
+  controlled_process = MSG_process_self(); /* - Get controlled at checkpoint */
+  MSG_barrier_wait(barrier);

   MSG_process_suspend(MSG_process_self());
   msg_host_t h = MSG_process_get_host(MSG_process_self());
   XBT_INFO("I've been moved on this new host: %s", MSG_host_get_name(h));
   MSG_process_suspend(MSG_process_self());
   msg_host_t h = MSG_process_get_host(MSG_process_self());
   XBT_INFO("I've been moved on this new host: %s", MSG_host_get_name(h));


@@ -41,13 +37,11 @@ static int emigrant(int argc, char *argv[])
 /* The policeman check for emigrants and move them back to 'Jacquelin' */
 static int policeman(int argc, char *argv[])
 {
 /* The policeman check for emigrants and move them back to 'Jacquelin' */
 static int policeman(int argc, char *argv[])
 {

-  xbt_mutex_acquire(checkpoint);

   XBT_INFO("Wait at the checkpoint.");  /* - block on the mutex+condition */
   XBT_INFO("Wait at the checkpoint.");  /* - block on the mutex+condition */

-  while (controlled_process == NULL) xbt_cond_wait(identification, checkpoint);
+  MSG_barrier_wait(barrier);

   MSG_process_migrate(controlled_process, MSG_host_by_name("Jacquelin")); /* - Move an emigrant to Jacquelin */
   XBT_INFO("I moved the emigrant");
   MSG_process_resume(controlled_process);
   MSG_process_migrate(controlled_process, MSG_host_by_name("Jacquelin")); /* - Move an emigrant to Jacquelin */
   XBT_INFO("I moved the emigrant");
   MSG_process_resume(controlled_process);

-  xbt_mutex_release(checkpoint);

 
   return 0;
 }
 
   return 0;
 }


@@ -62,12 +56,10 @@ int main(int argc, char *argv[])
   MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Jacquelin"));
   MSG_process_create("policeman", policeman, NULL, MSG_get_host_by_name("Boivin"));
 
   MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Jacquelin"));
   MSG_process_create("policeman", policeman, NULL, MSG_get_host_by_name("Boivin"));
 

-  checkpoint      = xbt_mutex_init(); /* - Initiate the mutex and conditions */
-  identification = xbt_cond_init();
+  barrier         = MSG_barrier_init(2);

   msg_error_t res = MSG_main(); /* - Run the simulation */
   XBT_INFO("Simulation time %g", MSG_get_clock());
   msg_error_t res = MSG_main(); /* - Run the simulation */
   XBT_INFO("Simulation time %g", MSG_get_clock());

-  xbt_cond_destroy(identification);
-  xbt_mutex_destroy(checkpoint);
+  MSG_barrier_destroy(barrier);

 
   return res != MSG_OK;
 }
 
   return res != MSG_OK;
 }