SimDag instrumentation for categorized resource utilization

details:
- only works with a combination of instrumented network and cpu models
- new tracing interface function TRACE_sd_set_task_category to set a SD_task category
- does not work with parallel tasks for now (if needed, we can do it)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8390 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2c03455..335bcb0 100755 (executable)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -336,6 +336,7 @@ set(TRACING_SRC
        src/instr/smx_instr.c
        src/instr/surf_instr.c
        src/instr/smpi_instr.c
        src/instr/smx_instr.c
        src/instr/surf_instr.c
        src/instr/smpi_instr.c

+       src/instr/sd_instr.c

        src/instr/variables_instr.c
        src/instr/resource_utilization.c
        src/instr/private.h
        src/instr/variables_instr.c
        src/instr/resource_utilization.c
        src/instr/private.h

diff --git a/include/instr/instr.h b/include/instr/instr.h
index 770c1ff..0e587b5 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -13,6 +13,7 @@
 
 #include "xbt.h"
 #include "msg/msg.h"
 
 #include "xbt.h"
 #include "msg/msg.h"

+#include "simdag/simdag.h"

 
 /* Trace error codes (used in exceptions) */
 #define TRACE_ERROR_COMPLEX_ROUTES 100
 
 /* Trace error codes (used in exceptions) */
 #define TRACE_ERROR_COMPLEX_ROUTES 100


@@ -37,6 +38,7 @@ XBT_PUBLIC(void) TRACE_user_link_variable (double time, const char *src, const c
 XBT_PUBLIC(void) TRACE_declare_mark (const char *mark_type);
 XBT_PUBLIC(void) TRACE_mark (const char *mark_type, const char *mark_value);
 XBT_PUBLIC(int) TRACE_smpi_set_category (const char *category);
 XBT_PUBLIC(void) TRACE_declare_mark (const char *mark_type);
 XBT_PUBLIC(void) TRACE_mark (const char *mark_type, const char *mark_value);
 XBT_PUBLIC(int) TRACE_smpi_set_category (const char *category);

+XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task, const char *category);

 
 #define TRACE_host_variable_declare(var) \
        TRACE_user_host_variable(0,var,0,"declare");
 
 #define TRACE_host_variable_declare(var) \
        TRACE_user_host_variable(0,var,0,"declare");


@@ -108,6 +110,7 @@ XBT_PUBLIC(int) TRACE_smpi_set_category (const char *category);
 #define TRACE_declare_mark(type)
 #define TRACE_mark(type,value)
 #define TRACE_smpi_set_category(cat)
 #define TRACE_declare_mark(type)
 #define TRACE_mark(type,value)
 #define TRACE_smpi_set_category(cat)

+#define TRACE_sd_set_task_category(task,cat)

 
 #endif /* HAVE_TRACING */
 
 
 #endif /* HAVE_TRACING */
 

diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h
index 2dac2c4..23fb969 100644 (file)
--- a/include/simdag/simdag.h
+++ b/include/simdag/simdag.h
@@ -206,5 +206,7 @@ XBT_PUBLIC(void) uniq_transfer_task_name(SD_task_t task);
 
 /** @} */
 
 
 /** @} */
 

+#include "instr/instr.h"
+

 SG_END_DECL()
 #endif
 SG_END_DECL()
 #endif

diff --git a/src/instr/private.h b/src/instr/private.h
index 2c44d75..d81839d 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -23,6 +23,7 @@ extern int tracing_active; /* declared in paje.c */
 
 #include "instr/instr.h"
 #include "msg/msg.h"
 
 #include "instr/instr.h"
 #include "msg/msg.h"

+#include "simdag/private.h"

 #include "simix/private.h"
 
 /* from paje.c */
 #include "simix/private.h"
 
 /* from paje.c */


@@ -150,6 +151,10 @@ void TRACE_surf_resource_utilization_end (smx_action_t action);
 void TRACE_surf_resource_utilization_alloc (void);
 void TRACE_surf_resource_utilization_release (void);
 
 void TRACE_surf_resource_utilization_alloc (void);
 void TRACE_surf_resource_utilization_release (void);
 

+/* sd_instr.c */
+void TRACE_sd_task_create (SD_task_t task);
+void TRACE_sd_task_destroy (SD_task_t task);
+

 #endif
 
 #endif /* PRIVATE_H_ */
 #endif
 
 #endif /* PRIVATE_H_ */

diff --git a/src/instr/sd_instr.c b/src/instr/sd_instr.c
new file mode 100644 (file)
index 0000000..e2a1895
--- /dev/null
+++ b/src/instr/sd_instr.c
@@ -0,0 +1,30 @@
+/* Copyright (c) 2010. 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 "instr/private.h"
+
+#ifdef HAVE_TRACING
+
+void TRACE_sd_task_create (SD_task_t task)
+{
+  if (!IS_TRACING) return;
+  task->category = NULL;
+}
+
+void TRACE_sd_task_destroy (SD_task_t task)
+{
+  if (!IS_TRACING) return;
+  if (task->category) xbt_free (task->category);
+}
+
+void TRACE_sd_set_task_category(SD_task_t task, const char *category)
+{
+  if (!IS_TRACING) return;
+  task->category = xbt_new (char, strlen (category)+1);
+  strncpy(task->category, category, strlen(category)+1);
+}
+
+#endif

diff --git a/src/simdag/private.h b/src/simdag/private.h
index 243a9e0..644c2ce 100644 (file)
--- a/src/simdag/private.h
+++ b/src/simdag/private.h
@@ -97,6 +97,10 @@ typedef struct SD_task {
   double *computation_amount;
   double *communication_amount;
   double rate;
   double *computation_amount;
   double *communication_amount;
   double rate;

+
+#ifdef HAVE_TRACING
+  char *category;      /* sd task category for instrumentation */
+#endif

 } s_SD_task_t;
 
 /* Task dependencies */
 } s_SD_task_t;
 
 /* Task dependencies */

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index baeca9f..7662cdb 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -12,6 +12,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/config.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/config.h"

+#include "instr/private.h"

 #ifdef HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #ifdef HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>


@@ -40,6 +41,9 @@ XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
  */
 void SD_init(int *argc, char **argv)
 {
  */
 void SD_init(int *argc, char **argv)
 {

+#ifdef HAVE_TRACING
+  TRACE_global_init (argc, argv);
+#endif

 
   s_SD_task_t task;
 
 
   s_SD_task_t task;
 


@@ -180,6 +184,10 @@ void SD_create_environment(const char *platform_file)
 
   DEBUG2("Workstation number: %d, link number: %d",
          SD_workstation_get_number(), SD_link_get_number());
 
   DEBUG2("Workstation number: %d, link number: %d",
          SD_workstation_get_number(), SD_link_get_number());

+
+#ifdef HAVE_TRACING
+  TRACE_surf_save_onelink ();
+#endif

 }
 
 /**
 }
 
 /**


@@ -350,6 +358,9 @@ double SD_get_clock(void)
  */
 void SD_exit(void)
 {
  */
 void SD_exit(void)
 {

+#ifdef HAVE_TRACING
+  TRACE_surf_release ();
+#endif

   if (SD_INITIALISED()) {
     DEBUG0("Destroying workstation and link dictionaries...");
     xbt_dict_free(&sd_global->workstations);
   if (SD_INITIALISED()) {
     DEBUG0("Destroying workstation and link dictionaries...");
     xbt_dict_free(&sd_global->workstations);

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 80fa27e..261a59f 100644 (file)
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -8,6 +8,7 @@
 #include "simdag/simdag.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 #include "simdag/simdag.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"

+#include "instr/private.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
                                 "Logging specific to SimDag (task)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
                                 "Logging specific to SimDag (task)");


@@ -64,6 +65,10 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
 
   sd_global->task_number++;
 
 
   sd_global->task_number++;
 

+#ifdef HAVE_TRACING
+  TRACE_sd_task_create (task);
+#endif
+

   return task;
 }
 
   return task;
 }
 


@@ -921,6 +926,10 @@ void __SD_task_really_run(SD_task_t task)
 
   DEBUG1("surf_action = %p", task->surf_action);
 
 
   DEBUG1("surf_action = %p", task->surf_action);
 

+#ifdef HAVE_TRACING
+  if (task->category) TRACE_surf_action(task->surf_action, task->category);
+#endif
+

   __SD_task_destroy_scheduling_data(task);      /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
   xbt_assert2(__SD_task_is_running(task), "Bad state of task '%s': %d",
   __SD_task_destroy_scheduling_data(task);      /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
   xbt_assert2(__SD_task_is_running(task), "Bad state of task '%s': %d",


@@ -1219,6 +1228,10 @@ void SD_task_destroy(SD_task_t task)
   if (task->computation_amount)
     xbt_free(task->computation_amount);
 
   if (task->computation_amount)
     xbt_free(task->computation_amount);
 

+#ifdef HAVE_TRACING
+  TRACE_sd_task_destroy (task);
+#endif
+

   xbt_dynar_free(&task->tasks_before);
   xbt_dynar_free(&task->tasks_after);
   xbt_free(task);
   xbt_dynar_free(&task->tasks_before);
   xbt_dynar_free(&task->tasks_after);
   xbt_free(task);