[simix] Rename s_smx_process_arg to simgrid::simix::ProcessArg

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index ce5d2a6..24adbc5 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -187,7 +187,7 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host,
   if (!sg_host_simix(host)->auto_restart_processes) {
     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();
+  smx_process_arg_t arg = new simgrid::simix::ProcessArg();
   arg->name = name;
   arg->code = code;
   arg->data = data;

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 54d6932..0effb83 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -991,7 +991,7 @@ smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer)
   XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_get_name(process->host));
   //retrieve the arguments of the old process
   //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
-  s_smx_process_arg_t arg;
+  simgrid::simix::ProcessArg arg;
   arg.code = process->code;
   arg.hostname = sg_host_get_name(process->host);
   arg.kill_time = SIMIX_timer_get_date(process->kill_timer);

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index c0fe279..8803cd7 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -19,7 +19,10 @@ typedef struct s_smx_process_exit_fun {
   void *arg;
 } s_smx_process_exit_fun_t, *smx_process_exit_fun_t;
 
-typedef class s_smx_process_arg {
+namespace simgrid {
+namespace simix {
+
+class ProcessArg {
 public:
   std::string name;
   xbt_main_func_t code;
@@ -30,10 +33,7 @@ public:
   double kill_time;
   xbt_dict_t properties;
   unsigned auto_restart:1;
-} s_smx_process_arg_t, *smx_process_arg_t;
-
-namespace simgrid {
-namespace simix {
+};
 
 class Process {
 public:
@@ -75,6 +75,8 @@ public:
 }
 }
 
+typedef simgrid::simix::ProcessArg *smx_process_arg_t;
+
 typedef simgrid::simix::Process* smx_process_t;
 
 SG_BEGIN_DECL()

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 27763ef..3ac46e5 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -575,7 +575,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   smx_process_arg_t arg = NULL;
   smx_process_t process_created = NULL;
 
-  arg = new s_smx_process_arg_t();
+  arg = new simgrid::simix::ProcessArg();
   arg->code = parse_code;
   arg->data = NULL;
   arg->hostname = sg_host_get_name(host);
@@ -593,7 +593,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
 
   if (start_time > SIMIX_get_clock()) {
-    arg = new s_smx_process_arg_t();
+    arg = new simgrid::simix::ProcessArg();
     arg->name = process->argv[0];
     arg->code = parse_code;
     arg->data = NULL;