From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 20 May 2016 08:13:39 +0000 (+0200)
Subject: [simix] Use std::string for s_smx_process_arg
X-Git-Tag: v3_14~1188
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3082f058f27fdbc39b5daebf6a720ab2272d6585?hp=a9d46ef793944afed370e7612e5b38e43be9ecc5;ds=sidebyside

[simix] Use std::string for s_smx_process_arg
---

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 15ffa679fc..ce5d2a6bed 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -165,7 +165,6 @@ void _SIMIX_host_free_process_arg(void *data)
   for (int i = 0; i < arg->argc; i++)
     xbt_free(arg->argv[i]);
   xbt_free(arg->argv);
-  xbt_free(arg->name);
   delete arg;
 }
 /**
@@ -189,7 +188,7 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host,
     sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
   }
   smx_process_arg_t arg = new s_smx_process_arg_t();
-  arg->name = xbt_strdup(name);
+  arg->name = name;
   arg->code = code;
   arg->data = data;
   arg->hostname = hostname;
diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index fb96cb0d2d..c0fe27991c 100644
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -7,6 +7,8 @@
 #ifndef _SIMIX_PROCESS_PRIVATE_H
 #define _SIMIX_PROCESS_PRIVATE_H
 
+#include <string>
+
 #include <xbt/base.h>
 
 #include "simgrid/simix.h"
@@ -19,7 +21,7 @@ typedef struct s_smx_process_exit_fun {
 
 typedef class s_smx_process_arg {
 public:
-  char *name;
+  std::string name;
   xbt_main_func_t code;
   void *data;
   const char *hostname;
diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bd5166236b..27763ef535 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -584,7 +584,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   int i;
   for (i=0; i<process->argc; i++)
     arg->argv[i] = xbt_strdup(process->argv[i]);
-  arg->name = xbt_strdup(arg->argv[0]);
+  arg->name = arg->argv[0];
   arg->kill_time = kill_time;
   arg->properties = current_property_set;
   if (!sg_host_simix(host)->boot_processes)
@@ -594,7 +594,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
 
   if (start_time > SIMIX_get_clock()) {
     arg = new s_smx_process_arg_t();
-    arg->name = (char*)(process->argv)[0];
+    arg->name = process->argv[0];
     arg->code = parse_code;
     arg->data = NULL;
     arg->hostname = sg_host_get_name(host);
@@ -603,11 +603,12 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
-    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, arg->hostname, start_time);
+    XBT_DEBUG("Process %s(%s) will be started at time %f",
+      arg->name.c_str(), arg->hostname, start_time);
     SIMIX_timer_set(start_time, [](void* p) {
       smx_process_arg_t arg = static_cast<smx_process_arg_t>(p);
       simix_global->create_process_function(
-                                            arg->name,
+                                            arg->name.c_str(),
                                             arg->code,
                                             arg->data,
                                             arg->hostname,
@@ -620,11 +621,12 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
       delete arg;
     }, arg);
   } else {                      // start_time <= SIMIX_get_clock()
-    XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host));
+    XBT_DEBUG("Starting Process %s(%s) right now",
+      arg->name.c_str(), sg_host_get_name(host));
 
     if (simix_global->create_process_function)
       process_created = simix_global->create_process_function(
-          arg->name,
+          arg->name.c_str(),
                                             parse_code,
                                             NULL,
                                             sg_host_get_name(host),
@@ -634,7 +636,8 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
                                             current_property_set,
                                             auto_restart, NULL);
     else
-      process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
+      process_created = simcall_process_create(
+          arg->name.c_str(), parse_code, NULL, sg_host_get_name(host), kill_time, process->argc,
           (char**)process->argv, current_property_set,auto_restart);
 
     /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */