X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0348479a2796507b00c93ea1c8c722da1ac09994..d9cad55dcc546b3936c278258e7f463ac70066df:/examples/msg/migration/migration.c

diff --git a/examples/msg/migration/migration.c b/examples/msg/migration/migration.c
index 7483953e87..4cf0400baf 100644
--- a/examples/msg/migration/migration.c
+++ b/examples/msg/migration/migration.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2009 The SimGrid team. All rights reserved.                */
+/* Copyright (c) 2009, 2010. 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. */
@@ -13,32 +12,58 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ *  
+ *  - <b>migration/migration.c</b> Demonstrates how to use the @ref
+ *    MSG_process_migrate function to let processes change the host they 
+ *    run on after their start. 
+ */
+
+xbt_mutex_t mutex = NULL;
+xbt_cond_t cond = NULL;
+static msg_process_t process_to_migrate = NULL;
+
 /** The guy we will move from host to host. It move alone and then is moved by policeman back  */
 static int emigrant(int argc, char *argv[])
 {
   m_task_t task;
-  INFO0
-    ("I'll look for a new job on another machine where the grass is greener.");
-  MSG_process_change_host(MSG_get_host_by_name("Boivin"));
-  INFO0("Yeah, found something to do");
+  XBT_INFO
+      ("I'll look for a new job on another machine where the grass is greener.");
+  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  
+  XBT_INFO("Yeah, found something to do");
   task = MSG_task_create("job", 98095000, 0, NULL);
   MSG_task_execute(task);
   MSG_task_destroy(task);
-  MSG_process_sleep (2);
-  INFO0("Moving back home after work");
-  MSG_process_change_host(MSG_get_host_by_name("Jacquelin"));
-  MSG_process_change_host(MSG_get_host_by_name("Boivin"));
-  MSG_process_sleep (4);
-  INFO0("Uh, nothing to do here. Stopping now");
+  MSG_process_sleep(2);
+  XBT_INFO("Moving back home after work");
+  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Jacquelin"));
+  MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name("Boivin"));
+  MSG_process_sleep(4);
+  xbt_mutex_acquire(mutex);
+  process_to_migrate = MSG_process_self();
+  xbt_cond_broadcast(cond);
+  xbt_mutex_release(mutex);
+  MSG_process_suspend(MSG_process_self());
+  m_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));
+  XBT_INFO("Uh, nothing to do here. Stopping now");
   return 0;
 }                               /* end_of_emigrant */
 
-/* This function would move the emigrant back home, if it were possible to do so in the MSG API.
- * Nothing for now.
- */
+
+/* This function move the emigrant on Jacquelin */
 static int policeman(int argc, char *argv[])
 {
-  INFO0("No function in the API to move the emigrant back, so do nothing.");
+
+  xbt_mutex_acquire(mutex);
+  XBT_INFO("Wait a bit before migrating the emigrant.");
+  while (process_to_migrate == NULL) xbt_cond_wait(cond, mutex);
+  MSG_process_migrate(process_to_migrate, MSG_get_host_by_name("Jacquelin"));
+  XBT_INFO("I moved the emigrant");
+  MSG_process_resume(process_to_migrate);
+  xbt_mutex_release(mutex);
+
   return 0;
 }                               /* end_of_policeman */
 
@@ -49,10 +74,10 @@ int main(int argc, char *argv[])
   MSG_error_t res = MSG_OK;
 
   /* Argument checking */
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
-    CRITICAL1("Usage: %s platform_file deployment_file\n", argv[0]);
-    CRITICAL1("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
+    XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
+    XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
               argv[0]);
     exit(1);
   }
@@ -62,11 +87,17 @@ int main(int argc, char *argv[])
 
   /* Application deployment */
   MSG_function_register("emigrant", emigrant);
+  MSG_function_register("policeman", policeman);
   MSG_launch_application(argv[2]);
 
   /* Run the simulation */
+  mutex = xbt_mutex_init();
+  cond = xbt_cond_init();
   res = MSG_main();
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
+  xbt_cond_destroy(cond);
+  xbt_mutex_destroy(mutex);
+
   if (res == MSG_OK)
     res = MSG_clean();