From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Fri, 20 Jan 2012 10:31:29 +0000 (+0100)
Subject: [trace] cleaner code for tracing examples
X-Git-Tag: exp_20120216~119^2~62
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/662ca0e49048d7aeadbd4f4b028cb0721a1d2a78

[trace] cleaner code for tracing examples
---

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index e5f7cec51b..1938a07ea5 100644
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -14,11 +14,6 @@
 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[])
 {
@@ -72,34 +67,6 @@ 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_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[])
 {
@@ -108,15 +75,24 @@ int main(int argc, char *argv[])
   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);
   }
 
-  res = test_all(argv[1], argv[2]);
-  MSG_clean();
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  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
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(deployment_file);
+
+  MSG_main();
+  MSG_clean();
+  return 0;
+}
diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index 80733456cf..a14f913596 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -14,11 +14,6 @@
 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[])
 {
@@ -80,47 +75,6 @@ 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_create_environment(platform_file);
-  }
-  {
-    /* declaring tracing categories */
-
-    //declaring user variables
-    TRACE_host_variable_declare("is_slave");
-    TRACE_host_variable_declare("is_master");
-    TRACE_host_variable_declare("task_creation");
-    TRACE_host_variable_declare("task_computation");
-
-    //declaring user markers
-    TRACE_declare_mark("msmark");
-
-    //declaring user categories with RGB colors (values from 0 to 1)
-    TRACE_category_with_color ("compute", "1 0 0");  //compute is red
-    TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
-    //categories without user-defined colors receive
-    //random colors generated by the tracing system
-    TRACE_category ("request");
-    TRACE_category_with_color ("report", NULL);
-  }
-  {                             /*   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[])
 {
@@ -129,15 +83,35 @@ int main(int argc, char *argv[])
   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);
   }
 
-  res = test_all(argv[1], argv[2]);
-  MSG_clean();
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
+
+  //declaring user variables
+  TRACE_host_variable_declare("is_slave");
+  TRACE_host_variable_declare("is_master");
+  TRACE_host_variable_declare("task_creation");
+  TRACE_host_variable_declare("task_computation");
+
+  //declaring user markers
+  TRACE_declare_mark("msmark");
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  //declaring user categories with RGB colors (values from 0 to 1)
+  TRACE_category_with_color ("compute", "1 0 0");  //compute is red
+  TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
+  //categories without user-defined colors receive
+  //random colors generated by the tracing system
+  TRACE_category ("request");
+  TRACE_category_with_color ("report", NULL);
+
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(deployment_file);
+
+  MSG_main();
+  MSG_clean();
+  return 0;
 }                               /* end_of_main */
diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index 846f59ff55..bdd30ca8d9 100644
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -73,29 +73,21 @@ int main(int argc, char *argv[])
   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);
   }
 
-  /* Simulation setting */
-  MSG_create_environment(argv[1]);
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
 
   TRACE_category ("migration_order");
 
   /* Application deployment */
   MSG_function_register("emigrant", emigrant);
   MSG_function_register("master", master);
-  MSG_launch_application(argv[2]);
+  MSG_launch_application(deployment_file);
 
-  /* Run the simulation */
-  res = MSG_main();
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  if (res == MSG_OK)
-    res = MSG_clean();
-
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  MSG_main();
+  MSG_clean();
+  return 0;
 }                               /* end_of_main */
diff --git a/examples/msg/tracing/tasks.c b/examples/msg/tracing/tasks.c
index 96d5f168fe..16ef444bd6 100644
--- a/examples/msg/tracing/tasks.c
+++ b/examples/msg/tracing/tasks.c
@@ -13,11 +13,6 @@
 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[])
 {
@@ -56,17 +51,14 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  MSG_error_t res;
 
   while (1) {
-    res = MSG_task_receive(&(task), "master_mailbox");
-    if (res != MSG_OK) {
-      XBT_INFO("error");
-      break;
-    }
+    MSG_task_receive(&(task), "master_mailbox");
 
     char *data = MSG_task_get_data(task);
     if (data && !strcmp(data, "finalize")) {
+      free(data);
       MSG_task_destroy(task);
       break;
     }
@@ -80,49 +72,27 @@ 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_create_environment(platform_file);
-  }
-  {
-    //declaring user categories
-    TRACE_category_with_color ("compute", "1 0 0");  //compute is red
-    TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
-  }
-  {                             /*   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_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);
   }
 
-  res = test_all(argv[1], argv[2]);
-  MSG_clean();
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
+
+  TRACE_category_with_color ("compute", "1 0 0");  //compute is red
+  TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(deployment_file);
+
+  MSG_main();
+  MSG_clean();
+  return 0;
+}