X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/226c4f59065a64dbc18cc40fefb858507ae2c984..1bdbe2db10271b1d1948e1ee0382abcfe622a991:/examples/msg/tracing/link_user_variables.c

diff --git a/examples/msg/tracing/link_user_variables.c b/examples/msg/tracing/link_user_variables.c
index 9f7a5cfe95..5c08fc6363 100644
--- a/examples/msg/tracing/link_user_variables.c
+++ b/examples/msg/tracing/link_user_variables.c
@@ -1,28 +1,33 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-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>
+#include <simgrid/msg.h>
 
-int master(int argc, char *argv[]);
+/** @addtogroup MSG_examples
+ *
+ * - <b>tracing/link_user_variables.c</b>: This program demonstrates how to trace user variables associated to the
+ * links of the platform file. You need to provide the name of the link to update the value of the variable associated
+ * to that link. You might want to run this program with the following parameters:
+ * --cfg=tracing:yes
+ * --cfg=tracing/platform:yes
+ * (See \ref tracing_tracing_options for details)
+ */
 
 //dump function to create and execute a task
 static void create_and_execute_task (void)
 {
-  m_task_t task = MSG_task_create("task", 1000000, 0, NULL);
+  msg_task_t task = MSG_task_create("task", 1000000, 0, NULL);
   MSG_task_execute (task);
   MSG_task_destroy (task);
 }
 
-int master(int argc, char *argv[])
+static int master(int argc, char *argv[])
 {
-  int i;
-
-  //set initial values for the link user variables
-  //this example only shows for links
-  //identified by "6" and "3" in the platform file
+  //set initial values for the link user variables this example only shows for links identified by "6" and "3" in the
+  //platform file
 
   //Set the Link_Capacity variable
   TRACE_link_variable_set("6", "Link_Capacity", 12.34);
@@ -33,7 +38,7 @@ int master(int argc, char *argv[])
   TRACE_link_variable_set("6", "Link_Utilization", 3.4);
 
   //run the simulation, update my variables accordingly
-  for (i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     create_and_execute_task ();
 
     //Add to link user variables
@@ -41,7 +46,7 @@ int master(int argc, char *argv[])
     TRACE_link_variable_add ("6", "Link_Utilization", 7.8);
   }
 
-  for (i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     create_and_execute_task ();
 
     //Subtract from link user variables
@@ -52,18 +57,15 @@ int master(int argc, char *argv[])
   return 0;
 }
 
-/** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     exit(1);
   }
 
-  char *platform_file = argv[1];
-  char *deployment_file = argv[2];
-  MSG_create_environment(platform_file);
+  MSG_create_environment(argv[1]);
 
   //declaring link user variables (one without, another with a RGB color)
   TRACE_link_variable_declare("Link_Capacity");
@@ -72,9 +74,8 @@ int main(int argc, char *argv[])
   //register "master" and "slave" functions and launch deployment
   MSG_function_register("master", master);
   MSG_function_register("slave", master);
-  MSG_launch_application(deployment_file);
+  MSG_launch_application(argv[2]);
 
   MSG_main();
-  MSG_clean();
   return 0;
 }