X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2444896cc5969f2b9150b035f9ea0744e74789d..578dd56a4a07709db1922ff5edd98f0c8f3090f9:/src/surf/cpu_cas01.cpp

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index fb91f38ab5..24189a472e 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -19,7 +19,7 @@ void surf_cpu_model_init_Cas01()
   xbt_assert(!surf_cpu_model_pm);
   xbt_assert(!surf_cpu_model_vm);
 
-  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
+  char *optim = xbt_cfg_get_string("cpu/optim");
   if (!strcmp(optim, "TI")) {
     surf_cpu_model_init_ti();
     return;
@@ -37,8 +37,8 @@ namespace surf {
 
 CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
 {
-  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
-  int select = xbt_cfg_get_boolean(_sg_cfg_set, "cpu/maxmin_selective_update");
+  char *optim = xbt_cfg_get_string("cpu/optim");
+  int select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
 
   if (!strcmp(optim, "Full")) {
     updateMechanism_ = UM_FULL;
@@ -47,9 +47,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
     updateMechanism_ = UM_LAZY;
     selectiveUpdate_ = 1;
     xbt_assert((select == 1)
-               ||
-               (xbt_cfg_is_default_value
-                (_sg_cfg_set, "cpu/maxmin_selective_update")),
+               || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")),
                "Disabling selective update while using the lazy update mechanism is dumb!");
   } else {
     xbt_die("Unsupported optimization (%s) for this model", optim);
@@ -71,9 +69,7 @@ CpuCas01Model::~CpuCas01Model()
 {
   lmm_system_free(maxminSystem_);
   maxminSystem_ = NULL;
-
-  if (actionHeap_)
-    xbt_heap_free(actionHeap_);
+  xbt_heap_free(actionHeap_);
   delete modifiedSet_;
 
   surf_cpu_model_pm = NULL;