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

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index 5ee80cab50..13f3955550 100644
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -1,22 +1,25 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2009 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. */
 
-#include "msg/msg.h"            /* core library */
-#include "xbt/sysdep.h"         /* calloc */
+/** @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:yes
+ * --cfg=tracing/msg/process:yes
+ * (See \ref tracing_tracing_options for details)
+ */
 
-/* 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);
@@ -24,24 +27,23 @@ static int emigrant(int argc, char *argv[])
   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
-    XBT_INFO("Migrating to %s", destination);
-    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
-    xbt_free (destination);
-    MSG_task_destroy (task);
+    free (destination);
     task = NULL;
   }
   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.
-  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"));
@@ -59,45 +61,26 @@ 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;
   }
+  xbt_dynar_free (&destinations);
   return 0;
 }
 
-/** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
-
-  /* Argument checking */
-  MSG_global_init(&argc, argv);
-  if (argc < 3) {
-    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);
-  }
+  MSG_init(&argc, argv);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  /* Simulation setting */
   MSG_create_environment(argv[1]);
 
   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();
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  if (res == MSG_OK)
-    res = MSG_clean();
+  MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Fafard"));
+  MSG_process_create("policeman", policeman, NULL, MSG_get_host_by_name("Tremblay"));
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  MSG_main();
+  return 0;
+}