SimDag instrumentation for categorized resource utilization

[simgrid.git] / src / simdag / sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 26d4a1c..7662cdb 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -12,6 +12,12 @@
 #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>
+#include <lualib.h>
+#endif
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
@@ -35,6 +41,9 @@ XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
  */
 void SD_init(int *argc, char **argv)
 {
+#ifdef HAVE_TRACING
+  TRACE_global_init (argc, argv);
+#endif
 
   s_SD_task_t task;
 
@@ -58,8 +67,10 @@ void SD_init(int *argc, char **argv)
 
   sd_global->not_scheduled_task_set =
     xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->scheduled_task_set =
+  sd_global->schedulable_task_set =
     xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->scheduled_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->runnable_task_set =
     xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->in_fifo_task_set =
@@ -73,7 +84,7 @@ void SD_init(int *argc, char **argv)
   sd_global->task_number = 0;
 
   surf_init(argc, argv);
-  xbt_cfg_set_string(_surf_cfg_set, "workstation/model", "ptask_L07");
+  xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model", "ptask_L07");
 }
 
 /**
@@ -96,6 +107,7 @@ void SD_application_reinit(void)
   if (SD_INITIALISED()) {
     DEBUG0("Recreating the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->schedulable_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
     xbt_swag_free(sd_global->runnable_task_set);
     xbt_swag_free(sd_global->in_fifo_task_set);
@@ -105,6 +117,8 @@ void SD_application_reinit(void)
 
     sd_global->not_scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->schedulable_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->runnable_task_set =
@@ -155,8 +169,8 @@ void SD_create_environment(const char *platform_file)
   DEBUG0("SD_create_environment");
 
   surf_config_models_setup(platform_file);
-
   parse_platform_file(platform_file);
+  surf_config_models_create_elms();
 
   /* now let's create the SD wrappers for workstations and links */
   xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
@@ -170,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());
+
+#ifdef HAVE_TRACING
+  TRACE_surf_save_onelink ();
+#endif
 }
 
 /**
@@ -256,9 +274,30 @@ xbt_dynar_t SD_simulate(double how_long)
                        dst = dependency->dst;
           if (dst->unsatisfied_dependencies>0)
                  dst->unsatisfied_dependencies--;
+          if (dst->is_not_ready>0)
+                 dst->is_not_ready--;
+
+          if (!(dst->unsatisfied_dependencies)){
+                 if (__SD_task_is_scheduled(dst))
+                         __SD_task_set_state(dst, SD_RUNNABLE);
+                 else
+                         __SD_task_set_state(dst, SD_SCHEDULABLE);
+          }
 
-          if (!(dst->unsatisfied_dependencies) && __SD_task_is_scheduled(dst))
-                 __SD_task_set_state(dst, SD_RUNNABLE);
+          if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E){
+                 SD_dependency_t comm_dep;
+                 SD_task_t comm_dst;
+                 xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
+                 comm_dst = comm_dep->dst;
+                 if (__SD_task_is_not_scheduled(comm_dst) &&
+                         comm_dst->is_not_ready>0){
+                         comm_dst->is_not_ready--;
+
+                                 if (!(comm_dst->is_not_ready)){
+                                         __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
+                                 }
+                         }
+          }
 
           /* is dst runnable now? */
           if (__SD_task_is_runnable(dst) && !sd_global->watch_point_reached) {
@@ -319,6 +358,9 @@ double SD_get_clock(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);
@@ -336,6 +378,7 @@ void SD_exit(void)
 
     DEBUG0("Destroying the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->schedulable_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
     xbt_swag_free(sd_global->runnable_task_set);
     xbt_swag_free(sd_global->in_fifo_task_set);
@@ -353,3 +396,23 @@ void SD_exit(void)
     /* we cannot use exceptions here because xbt is not running! */
   }
 }
+
+/**
+ * \bried load script file
+ */
+
+void SD_load_environment_script(const char* script_file)
+{
+#ifdef HAVE_LUA
+    lua_State *L = lua_open();
+    luaL_openlibs(L);
+
+    if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
+         printf("error: %s\n", lua_tostring(L, -1));
+         return;
+       }
+#else
+    xbt_die("Lua is not available!! to call SD_load_environment_script, lua should be available...");
+#endif
+    return;
+}