X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..04bd690a70b98f7bb0e070751afbefb380d6345c:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index e3f62b1381..b41c85a03d 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -43,9 +43,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 +79,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 +100,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 +126,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);
@@ -209,20 +202,14 @@ 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);
+    if(surf_workstation[SURF_HOST_LEVEL])
+      __SD_workstation_create(surf_workstation[SURF_HOST_LEVEL], NULL);
   }
 
   xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
@@ -436,9 +423,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);
 
@@ -458,9 +443,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;