[trace] remove info messages from process migration test, update its tesh

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

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index cffb528..165bd41 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -1,5 +1,3 @@
-/*     $Id$     */
-
 /* Copyright (c) 2009 The SimGrid team. All rights reserved.                */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -19,19 +17,16 @@ static int emigrant(int argc, char *argv[])
   m_task_t task = NULL;
   char *destination = NULL;
 
-  INFO0("Setting process category");
-  TRACE_msg_set_process_category(MSG_process_self(), "emigrant", "1 0 0");
   MSG_process_sleep(2);
 
   while (1){ // I am an eternal emigrant
     MSG_task_receive(&(task), "master_mailbox");
     destination = (char*)MSG_task_get_data (task);
+    MSG_task_destroy (task);
     if (!destination) break; //there is no destination, die
-    INFO1("Migrating to %s", destination);
-    MSG_process_change_host(MSG_get_host_by_name(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);
+    free (destination);
     task = NULL;
   }
   return 0;
@@ -41,11 +36,9 @@ static int master(int argc, char *argv[])
 {
   m_task_t task = NULL;
 
-  TRACE_msg_set_process_category(MSG_process_self(), "master", "1 0 0");
-
   // 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"));
@@ -67,6 +60,7 @@ static int master(int argc, char *argv[])
     MSG_task_send (task, "master_mailbox");
     task = NULL;
   }
+  xbt_dynar_free (&destinations);
   return 0;
 }
 
@@ -78,30 +72,22 @@ 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",
-              argv[0]);
+    XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
     exit(1);
   }
 
-  /* Simulation setting */
-  MSG_create_environment(argv[1]);
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
 
   TRACE_category ("migration_order");
 
   /* Application deployment */
   MSG_function_register("emigrant", emigrant);
   MSG_function_register("master", master);
-  MSG_launch_application(argv[2]);
-
-  /* Run the simulation */
-  res = MSG_main();
-  INFO1("Simulation time %g", MSG_get_clock());
-  if (res == MSG_OK)
-    res = MSG_clean();
+  MSG_launch_application(deployment_file);
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  MSG_main();
+  MSG_clean();
+  return 0;
 }                               /* end_of_main */