X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a21681e5aca1a37efb2e9001e5055dec94c5de41..8465282253954c58d16cb5dae9a5d064eada3329:/src/simdag/sd_global.c?ds=sidebyside

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index cbfc3713aa..b8c3c8151a 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-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -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,13 +79,9 @@ 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
@@ -108,7 +102,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()");
@@ -216,8 +210,8 @@ void SD_create_environment(const char *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);
+    if(surf_workstation[SURF_HOST_LEVEL])
+      __SD_workstation_create(surf_workstation[SURF_HOST_LEVEL], NULL);
   }
 
   xbt_lib_foreach(link_lib, cursor, name, surf_link) {
@@ -436,9 +430,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 +450,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;