X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2696e7d1bca082a983f1887ba14f90543f2cd173..ec40265fd12aabf117e6c0c3f77347bc351cff76:/examples/msg/tracing/categories.c

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index 08d4b3b42e..22d2c47801 100644
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -1,61 +1,64 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* 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/categories.c</b> This is a master/slave program where the master creates tasks, send them to the slaves.
+ * For each task received, the slave executes it and then destroys it. This program declares several tracing categories
+ * that are used to classify tasks. When the program is executed, the tracing mechanism registers the resource
+ * utilization of hosts and links according to these categories. You might want to run this program with the following
+ * parameters:
+ * --cfg=tracing:yes
+ * --cfg=tracing/categorized:yes
+ * --cfg=tracing/uncategorized:yes
+ * --cfg=viva/categorized:viva_cat.plist
+ * --cfg=viva/uncategorized:viva_uncat.plist
+ * (See \ref tracing_tracing_options for details)
+ */
+
 #include <stdio.h>
-#include "msg/msg.h"
-#include "xbt/sysdep.h"         /* calloc, printf */
-
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
-
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file,
-                     const char *application_file);
-
-/** Emitter function  */
-int master(int argc, char *argv[])
+#include "simgrid/msg.h"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
+
+static int master(int argc, char *argv[])
 {
-  long number_of_tasks = atol(argv[1]);
-  long slaves_count = atol(argv[4]);
+  long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
+  long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
 
   int i;
   for (i = 0; i < number_of_tasks; i++) {
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
 
     //creating task and setting its category
     if (i % 2) {
       task = MSG_task_create("task_compute", 10000000, 0, NULL);
-      TRACE_msg_set_task_category(task, "compute");
+      MSG_task_set_category(task, "compute");
     } else if (i % 3) {
       task = MSG_task_create("task_request", 10, 10, NULL);
-      TRACE_msg_set_task_category(task, "request");
+      MSG_task_set_category(task, "request");
     } else {
       task = MSG_task_create("task_data", 10, 10000000, NULL);
-      TRACE_msg_set_task_category(task, "data");
+      MSG_task_set_category(task, "data");
     }
     MSG_task_send(task, "master_mailbox");
   }
 
   for (i = 0; i < slaves_count; i++) {
-    m_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
-    TRACE_msg_set_task_category(finalize, "finalize");
+    msg_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
+    MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
   }
 
   return 0;
 }
 
-/** Receiver function  */
-int slave(int argc, char *argv[])
+static int slave(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
 
   while (1) {
     MSG_task_receive(&(task), "master_mailbox");
@@ -72,52 +75,24 @@ int slave(int argc, char *argv[])
   return 0;
 }
 
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
-                     const char *application_file)
-{
-  MSG_error_t res = MSG_OK;
-
-  {                             /*  Simulation setting */
-    MSG_set_channel_number(0);
-    MSG_create_environment(platform_file);
-  }
-  {
-    //declaring user categories with RGB colors
-    TRACE_category_with_color ("compute", "1 0 0"); //red
-    TRACE_category_with_color ("request", "0 1 0"); //green
-    TRACE_category_with_color ("data", "0 0 1");    //blue
-    TRACE_category_with_color ("finalize", "0 0 0");//black
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("master", master);
-    MSG_function_register("slave", slave);
-    MSG_launch_application(application_file);
-  }
-  res = MSG_main();
-
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  return res;
-}
-
-
-/** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  MSG_init(&argc, argv);
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
 
-  MSG_global_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
-    exit(1);
-  }
+  MSG_create_environment(argv[1]);
+
+  //declaring user categories with RGB colors
+  TRACE_category_with_color ("compute", "1 0 0"); //red
+  TRACE_category_with_color ("request", "0 1 0"); //green
+  TRACE_category_with_color ("data", "0 0 1");    //blue
+  TRACE_category_with_color ("finalize", "0 0 0");//black
 
-  res = test_all(argv[1], argv[2]);
-  MSG_clean();
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(argv[2]);
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  MSG_main();
+  return 0;
+}