Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / examples / msg / tracing / user_variables.c

diff --git a/examples/msg/tracing/user_variables.c b/examples/msg/tracing/user_variables.c
index 9cf0e43..b338130 100644 (file)
--- a/examples/msg/tracing/user_variables.c
+++ b/examples/msg/tracing/user_variables.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,28 +6,20 @@
 
 /** @addtogroup MSG_examples
  * 
- * - <b>tracing/user_variables.c</b>: This program demonstrates how to
- * trace user variables associated to the hosts of the platform file.
- * You might want to run this program with the following parameters:
- * --cfg=tracing:1
- * --cfg=tracing/platform:1
+ * - <b>tracing/user_variables.c</b>: This program demonstrates how to trace user variables associated to the hosts of
+ * the platform file. 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)
  */
 
-#include <stdio.h>
-#include "msg/msg.h"
-#include "xbt/sysdep.h"         /* calloc, printf */
+#include "simgrid/msg.h"
 
-/* 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 master(int argc, char *argv[])
+static int master(int argc, char *argv[])
 {
-  char *hostname = MSG_host_self()->name;
+  const char *hostname = MSG_host_get_name(MSG_host_self());
   int i;
 
   //the hostname has an empty HDD with a capacity of 100000 (bytes)
@@ -36,7 +28,7 @@ int master(int argc, char *argv[])
 
   for (i = 0; i < 10; i++) {
     //create and execute a task just to make the simulated time advance
-    m_task_t task = MSG_task_create("task", 10000, 0, NULL);
+    msg_task_t task = MSG_task_create("task", 10000, 0, NULL);
     MSG_task_execute (task);
     MSG_task_destroy (task);
 
@@ -46,7 +38,7 @@ int master(int argc, char *argv[])
 
   for (i = 0; i < 10; i++) {
     //create and execute a task just to make the simulated time advance
-    m_task_t task = MSG_task_create("task", 10000, 0, NULL);
+    msg_task_t task = MSG_task_create("task", 10000, 0, NULL);
     MSG_task_execute (task);
     MSG_task_destroy (task);
 
@@ -56,18 +48,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 user variables
   TRACE_host_variable_declare("HDD_capacity");
@@ -76,9 +65,63 @@ int main(int argc, char *argv[])
   //register 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();
+
+  //get user declared variables
+  unsigned int cursor;
+  char *variable;
+  xbt_dynar_t host_variables = TRACE_get_host_variables ();
+  if (host_variables){
+    XBT_INFO ("Declared host variables:");
+    xbt_dynar_foreach (host_variables, cursor, variable){
+      XBT_INFO ("%s", variable);
+    }
+    xbt_dynar_free (&host_variables);
+  }
+  xbt_dynar_t link_variables = TRACE_get_link_variables ();
+  if (link_variables){
+    XBT_INFO ("Declared link variables:");
+    xbt_dynar_foreach (link_variables, cursor, variable){
+      XBT_INFO ("%s", variable);
+    }
+    xbt_dynar_free (&link_variables);
+  }
+
+  //create a customized viva graph configuration file
+  FILE *fp;
+  fp = fopen ("viva_graph.plist", "w");
+  if (!fp){
+    return 1;
+  }
+  fprintf (fp, "{\n node = (");
+  xbt_dynar_t nodes_type = TRACE_get_node_types ();
+  if (nodes_type){
+    XBT_INFO ("Node types in the trace:");
+    char *node_type;
+    xbt_dynar_foreach (nodes_type, cursor, node_type){
+      XBT_INFO ("%s", node_type);
+      fprintf (fp, "%s, ", node_type);
+    }
+    xbt_dynar_free (&nodes_type);
+  }
+  fprintf (fp, ");\n edge = (");
+  xbt_dynar_t edges_type = TRACE_get_edge_types ();
+  if (edges_type){
+    XBT_INFO ("Node types in the trace:");
+    char *edge_type;
+    xbt_dynar_foreach (edges_type, cursor, edge_type){
+      XBT_INFO ("%s", edge_type);
+      fprintf (fp, "%s, ", edge_type);
+    }
+    xbt_dynar_free (&edges_type);
+  }
+  fprintf (fp, ");\n");
+  fprintf (fp, " host = {\n  type = square;\n  size = HDD_capacity; \n  values = (HDD_utilization);\n };\n");
+  fprintf (fp, " link = {\n  type = rhombus;\n  size = bandwidth;\n };\n");
+  fprintf (fp, "}\n");
+  fclose (fp);
+
   return 0;
 }