[surf] Don't free power_peak from the caller

[simgrid.git] / src / surf / host_ptask_L07.cpp

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index 2f1006a..d7ff6f3 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -317,7 +317,6 @@ Cpu *CpuL07Model::createCpu(const char *name,  xbt_dynar_t powerPeak,
                           xbt_dict_t cpu_properties)
 {
   double power_initial = xbt_dynar_get_as(powerPeak, pstate, double);
-  xbt_dynar_free(&powerPeak);   // kill memory leak
   sg_host_t sg_host = sg_host_by_name(name);
 
   xbt_assert(!surf_host_resource_priv(sg_host),
@@ -327,10 +326,7 @@ Cpu *CpuL07Model::createCpu(const char *name,  xbt_dynar_t powerPeak,
   CpuL07 *cpu = new CpuL07(this, name, cpu_properties,
                                     power_initial, power_scale, power_trace,
                          core, state_initial, state_trace);
-  surf_callback_emit(cpuCreatedCallbacks, cpu);
-  surf_callback_emit(cpuStateChangedCallbacks, cpu, SURF_RESOURCE_ON, state_initial);
-  sg_host_surfcpu_set(sg_host, cpu);
-
+  sg_host_surfcpu_register(sg_host, cpu);
   return cpu;
 }
 
@@ -347,11 +343,13 @@ Link* NetworkL07Model::createLink(const char *name,
   xbt_assert(!Link::byName(name),
                 "Link '%s' declared several times in the platform file.", name);
 
-  return new LinkL07(this, name, properties,
+  Link* link = new LinkL07(this, name, properties,
                             bw_initial, bw_trace,
                                         lat_initial, lat_trace,
                                         state_initial, state_trace,
                                         policy);
+  surf_callback_emit(networkLinkCreatedCallbacks, link);
+  return link;
 }
 
 void HostL07Model::addTraces()