X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a8dfdb49f69b809acd48b63087e285e1218cbdb..c93f053fe60b1880db916d2dc83ad03b0bb436a7:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 54feb2d027..b625857f8b 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2013. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,6 +10,7 @@
 #include "xbt/dynar.h"
 #include "surf/surf.h"
 #include "simgrid/sg_config.h"
+#include "simgrid/host.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
@@ -43,9 +44,7 @@ SD_global_t sd_global = NULL;
  */
 void SD_init(int *argc, char **argv)
 {
-#ifdef HAVE_TRACING
   TRACE_global_init(argc, argv);
-#endif
 
   s_SD_task_t task;
 
@@ -81,20 +80,14 @@ void SD_init(int *argc, char **argv)
 
   surf_init(argc, argv);
 
-  xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model",
+  xbt_cfg_setdefault_string(_sg_cfg_set, "host/model",
                             "ptask_L07");
 
-#ifdef HAVE_TRACING
-  TRACE_start ();
-#endif
-
 #ifdef HAVE_JEDULE
   jedule_sd_init();
 #endif
 
   XBT_DEBUG("ADD SD LEVELS");
-  SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
-  SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy);
   SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy);
 
   if (_sg_cfg_exit_asap) {
@@ -108,7 +101,7 @@ void SD_init(int *argc, char **argv)
  * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
  *
  * Example:
- * SD_config("workstation/model","default");
+ * SD_config("host/model","default");
  */
 void SD_config(const char *key, const char *value){
   xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()");
@@ -134,6 +127,7 @@ void SD_application_reinit(void)
   s_SD_task_t task;
 
   SD_task_t done_task, next_done_task;
+  xbt_die("This function is not working since the C++ links and others. Please report the problem if you really need that function.");
 
    XBT_DEBUG("Recreating the swags...");
   xbt_swag_free(sd_global->not_scheduled_task_set);
@@ -208,21 +202,19 @@ void SD_create_environment(const char *platform_file)
 {
   xbt_lib_cursor_t cursor = NULL;
   char *name = NULL;
-  void **surf_workstation = NULL;
-  void **surf_link = NULL;
   void **surf_storage = NULL;
 
   parse_platform_file(platform_file);
 
   /* now let's create the SD wrappers for workstations, storages and links */
-  xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
-    if(surf_workstation[SURF_WKS_LEVEL])
-      __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
-  }
-
-  xbt_lib_foreach(link_lib, cursor, name, surf_link) {
-  if(surf_link[SURF_LINK_LEVEL])
-    __SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
+  {
+    xbt_dict_cursor_t cursor = NULL;
+    simgrid_Host* host = NULL;
+    xbt_dict_foreach(host_list, cursor, name, host){
+      surf_Host* surf_host = (surf_Host*) surf_host_resource_priv(host);
+      if (surf_host != NULL)
+        __SD_workstation_create(surf_host, NULL);
+    }
   }
 
   xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
@@ -311,12 +303,11 @@ xbt_swag_t SD_simulate_swag(double how_long) {
       total_time += elapsed_time;
 
     /* let's see which tasks are done */
-    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);
+    xbt_dynar_foreach(all_existing_models, iter, model) {
+      while ((action = surf_model_extract_done_action_set(model))) {
+        task = surf_action_get_data(action);
+        task->start_time = surf_action_get_start_time(task->surf_action);
+
         task->finish_time = surf_get_clock();
         XBT_VERB("Task '%s' done", SD_task_get_name(task));
         XBT_DEBUG("Calling __SD_task_just_done");
@@ -380,15 +371,13 @@ xbt_swag_t SD_simulate_swag(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);
+      while ((action = surf_model_extract_failed_action_set(model))) {
+        task = surf_action_get_data(action);
+        task->start_time = surf_action_get_start_time(task->surf_action);
         task->finish_time = surf_get_clock();
         XBT_VERB("Task '%s' failed", SD_task_get_name(task));
         __SD_task_set_state(task, SD_FAILED);
-        surf_workstation_model->action_unref(action);
+        surf_action_unref(action);
         task->surf_action = NULL;
 
         xbt_swag_insert(task,sd_global->return_set);
@@ -438,9 +427,7 @@ double SD_get_clock(void) {
  */
 void SD_exit(void)
 {
-#ifdef HAVE_TRACING
   TRACE_surf_resource_utilization_release();
-#endif
 
   xbt_mallocator_free(sd_global->task_mallocator);
 
@@ -460,9 +447,7 @@ void SD_exit(void)
   xbt_swag_free(sd_global->failed_task_set);
   xbt_swag_free(sd_global->return_set);
 
-#ifdef HAVE_TRACING
   TRACE_end();
-#endif
 
   xbt_free(sd_global);
   sd_global = NULL;