X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee3e6ba1b2e81efa3f9857ed0c8692e165f7131f..6628f256d9dc13c27721bb9846269e5f3c653d3c:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index b82cd23c5b..ff315b3721 100644
--- 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;
 
@@ -57,25 +66,27 @@ void SD_init(int *argc, char **argv)
   sd_global->watch_point_reached = 0;
 
   sd_global->not_scheduled_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->schedulable_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      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));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->in_fifo_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->running_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->done_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->failed_task_set =
-    xbt_swag_new(xbt_swag_offset(task, state_hookup));
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   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");
 }
 
 /**
@@ -107,21 +118,21 @@ void SD_application_reinit(void)
     xbt_swag_free(sd_global->failed_task_set);
 
     sd_global->not_scheduled_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->schedulable_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->scheduled_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->runnable_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->in_fifo_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->running_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->done_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->failed_task_set =
-      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->task_number = 0;
   } else {
     WARN0("SD_application_reinit called before initialization of SimDag");
@@ -160,8 +171,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,
@@ -169,12 +180,17 @@ void SD_create_environment(const char *platform_file)
     __SD_workstation_create(surf_workstation, NULL);
   }
 
-  xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor, name, surf_link) {
+  xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor,
+                   name, surf_link) {
     __SD_link_create(surf_link, NULL);
   }
 
   DEBUG2("Workstation number: %d, link number: %d",
          SD_workstation_get_number(), SD_link_get_number());
+
+#ifdef HAVE_TRACING
+  TRACE_surf_save_onelink();
+#endif
 }
 
 /**
@@ -218,7 +234,8 @@ xbt_dynar_t SD_simulate(double how_long)
   /* explore the runnable tasks */
   xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
     VERB1("Executing task '%s'", SD_task_get_name(task));
-    if (__SD_task_try_to_run(task) && !xbt_dynar_member(changed_tasks, &task))
+    if (__SD_task_try_to_run(task)
+        && !xbt_dynar_member(changed_tasks, &task))
       xbt_dynar_push(changed_tasks, &task);
   }
 
@@ -244,7 +261,9 @@ xbt_dynar_t SD_simulate(double how_long)
     xbt_dynar_foreach(model_list, iter, model) {
       while ((action = xbt_swag_extract(model->states.done_action_set))) {
         task = action->data;
-        task->start_time = surf_workstation_model->action_get_start_time(task->surf_action);
+        task->start_time =
+            surf_workstation_model->
+            action_get_start_time(task->surf_action);
         task->finish_time = surf_get_clock();
         VERB1("Task '%s' done", SD_task_get_name(task));
         DEBUG0("Calling __SD_task_just_done");
@@ -257,37 +276,38 @@ xbt_dynar_t SD_simulate(double how_long)
           xbt_dynar_push(changed_tasks, &task);
 
         /* remove the dependencies after this task */
-        xbt_dynar_foreach(task->tasks_after, depcnt, dependency){
-			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);
+        xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
+          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 (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);
-       			  }
-       		  }
+          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) {
+          if (__SD_task_is_runnable(dst)
+              && !sd_global->watch_point_reached) {
             VERB1("Executing task '%s'", SD_task_get_name(dst));
             if (__SD_task_try_to_run(dst) &&
                 !xbt_dynar_member(changed_tasks, &task))
@@ -299,7 +319,9 @@ xbt_dynar_t SD_simulate(double how_long)
       /* let's see which tasks have just failed */
       while ((action = xbt_swag_extract(model->states.failed_action_set))) {
         task = action->data;
-        task->start_time = surf_workstation_model->action_get_start_time(task->surf_action);
+        task->start_time =
+            surf_workstation_model->
+            action_get_start_time(task->surf_action);
         task->finish_time = surf_get_clock();
         VERB1("Task '%s' failed", SD_task_get_name(task));
         __SD_task_set_state(task, SD_FAILED);
@@ -345,6 +367,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);
@@ -380,3 +405,24 @@ 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;
+}