Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
put back a leak (for now) to fix tests
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 8 Aug 2017 08:15:57 +0000 (10:15 +0200)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 8 Aug 2017 08:15:57 +0000 (10:15 +0200)
src/surf/sg_platf.cpp

index ad15673..30aeb1c 100644 (file)
@@ -427,12 +427,6 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
-  std::map<std::string, std::string> props;
-  if (process->properties) {
-    for (auto elm : *process->properties)
-      props.insert({elm.first, elm.second});
-    delete process->properties;
-  }
   sg_host_t host = sg_host_by_name(process->host);
   if (not host) {
     // The requested host does not exist. Do a nice message to the user
   sg_host_t host = sg_host_by_name(process->host);
   if (not host) {
     // The requested host does not exist. Do a nice message to the user
@@ -468,7 +462,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   arg->data = nullptr;
   arg->host = host;
   arg->kill_time = kill_time;
   arg->data = nullptr;
   arg->host = host;
   arg->kill_time = kill_time;
-  arg->properties = &props;
+  arg->properties = process->properties;
 
   host->extension<simgrid::simix::Host>()->boot_processes.push_back(arg);
 
 
   host->extension<simgrid::simix::Host>()->boot_processes.push_back(arg);
 
@@ -480,7 +474,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->data = nullptr;
     arg->host = host;
     arg->kill_time = kill_time;
     arg->data = nullptr;
     arg->host = host;
     arg->kill_time = kill_time;
-    arg->properties = &props;
+    arg->properties = process->properties;
 
     XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time);
     SIMIX_timer_set(start_time, [arg, auto_restart]() {
 
     XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time);
     SIMIX_timer_set(start_time, [arg, auto_restart]() {