Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / examples / msg / tracing / procmig.c

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index d3e139c..72b16fb 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -25,10 +25,9 @@ static int emigrant(int argc, char *argv[])
     MSG_task_receive(&(task), "master_mailbox");
     destination = (char*)MSG_task_get_data (task);
     if (!destination) break; //there is no destination, die
-    INFO1("Migrating to %s", destination);
-    MSG_process_change_host(MSG_get_host_by_name(destination));
+    XBT_INFO("Migrating to %s", destination);
+    MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name(destination));
     MSG_process_sleep(2); // I am tired, have to sleep for 2 seconds
-    xbt_free (destination);
     MSG_task_destroy (task);
     task = NULL;
   }
@@ -41,7 +40,7 @@ static int master(int argc, char *argv[])
 
   // I am the master of emigrant process,
   // I tell it where it must emigrate to.
-  xbt_dynar_t destinations = xbt_dynar_new (sizeof(char*), xbt_free);
+  xbt_dynar_t destinations = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
   xbt_dynar_push_as (destinations, char*, xbt_strdup ("Tremblay"));
   xbt_dynar_push_as (destinations, char*, xbt_strdup ("Jupiter"));
   xbt_dynar_push_as (destinations, char*, xbt_strdup ("Fafard"));
@@ -63,6 +62,7 @@ static int master(int argc, char *argv[])
     MSG_task_send (task, "master_mailbox");
     task = NULL;
   }
+  xbt_dynar_free (&destinations);
   return 0;
 }
 
@@ -74,8 +74,8 @@ int main(int argc, char *argv[])
   /* Argument checking */
   MSG_global_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);
   }
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 
   /* Run the simulation */
   res = MSG_main();
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   if (res == MSG_OK)
     res = MSG_clean();