X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae8140f19db6cb86f753e32499eab49190846d1f..e98247819f8693d64145110665434d3a6a01ffc3:/examples/msg/tracing/procmig.c

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index 3c2121a41a..13f3955550 100644
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -1,32 +1,25 @@
-/* Copyright (c) 2010 The SimGrid team. All rights reserved.                */
+/* Copyright (c) 2010-2015. 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. */
 
 /** @addtogroup MSG_examples
  * 
- * - <b>tracing/procmig.c</b> This program shows a process migration. Tracing
- * this program with the options below enables a gantt-chart visualization
- * of where the process has been during its execution. Migrations are represented by
- * arrows from the origin to the destination host.
- * You might want to run this program with the following parameters:
- * --cfg=tracing:1
- * --cfg=tracing/msg/process:1
+ * - <b>tracing/procmig.c</b> This program shows a process migration. Tracing this program with the options below
+ * enables a gantt-chart visualization of where the process has been during its execution. Migrations are represented by
+ * arrows from the origin to the destination host. You might want to run this program with the following parameters:
+ * --cfg=tracing:yes
+ * --cfg=tracing/msg/process:yes
  * (See \ref tracing_tracing_options for details)
  */
 
-#include "msg/msg.h"            /* core library */
-#include "xbt/sysdep.h"         /* calloc */
-
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
+#include "simgrid/msg.h"
 
 /** 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 = NULL;
+  msg_task_t task = NULL;
   char *destination = NULL;
 
   MSG_process_sleep(2);
@@ -36,7 +29,7 @@ static int emigrant(int argc, char *argv[])
     destination = (char*)MSG_task_get_data (task);
     MSG_task_destroy (task);
     if (!destination) break; //there is no destination, die
-    MSG_process_migrate(MSG_process_self(), MSG_get_host_by_name(destination));
+    MSG_process_migrate(MSG_process_self(), MSG_host_by_name(destination));
     MSG_process_sleep(2); // I am tired, have to sleep for 2 seconds
     free (destination);
     task = NULL;
@@ -44,9 +37,9 @@ static int emigrant(int argc, char *argv[])
   return 0;
 }
 
-static int master(int argc, char *argv[])
+static int policeman(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
 
   // I am the master of emigrant process,
   // I tell it where it must emigrate to.
@@ -68,7 +61,7 @@ static int master(int argc, char *argv[])
     if (destination){
       MSG_task_set_data(task, xbt_strdup (destination));
     }
-    TRACE_msg_set_task_category(task, "migration_order");
+    MSG_task_set_category(task, "migration_order");
     MSG_task_send (task, "master_mailbox");
     task = NULL;
   }
@@ -76,28 +69,18 @@ static int master(int argc, char *argv[])
   return 0;
 }
 
-/** Main function */
 int main(int argc, char *argv[])
 {
-  /* Argument checking */
-  MSG_global_init(&argc, argv);
-  if (argc < 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  MSG_init(&argc, argv);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  char *platform_file = argv[1];
-  char *deployment_file = argv[2];
-  MSG_create_environment(platform_file);
+  MSG_create_environment(argv[1]);
 
   TRACE_category ("migration_order");
 
-  /* Application deployment */
-  MSG_function_register("emigrant", emigrant);
-  MSG_function_register("master", master);
-  MSG_launch_application(deployment_file);
+  MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Fafard"));
+  MSG_process_create("policeman", policeman, NULL, MSG_get_host_by_name("Tremblay"));
 
   MSG_main();
-  MSG_clean();
   return 0;
-}                               /* end_of_main */
+}