Chord: update some messages displayed

[simgrid.git] / examples / msg / migration / migration.c

diff --git a/examples/msg/migration/migration.c b/examples/msg/migration/migration.c
index 44de664..5abb763 100644 (file)
--- 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. */
@@ -16,21 +15,20 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 /** 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[])
 {
-  TRACE_msg_set_process_category (MSG_process_self(), "emigrant");
   m_task_t task;
-  INFO0
-    ("I'll look for a new job on another machine where the grass is greener.");
+  XBT_INFO
+      ("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("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_sleep(2);
+  XBT_INFO("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(4);
+  XBT_INFO("Uh, nothing to do here. Stopping now");
   return 0;
 }                               /* end_of_emigrant */
 
@@ -39,7 +37,8 @@ static int emigrant(int argc, char *argv[])
  */
 static int policeman(int argc, char *argv[])
 {
-  INFO0("No function in the API to move the emigrant back, so do nothing.");
+  XBT_INFO
+      ("No function in the API to move the emigrant back, so do nothing.");
   return 0;
 }                               /* end_of_policeman */
 
@@ -49,14 +48,11 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  TRACE_start_with_mask ("zmsg_test.trace", TRACE_PLATFORM|TRACE_PROCESS);
-  TRACE_category ("emigrant");
-
   /* 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);
   }
@@ -70,12 +66,10 @@ 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();
 
-  TRACE_end ();
-
   if (res == MSG_OK)
     return 0;
   else