Rename xbt/xbt_context.h to xbt/context.h, and add src/include/xbt/context.h to the...

[simgrid.git] / src / simix / private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index b9d0499..8a31f69 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -38,9 +38,9 @@ typedef struct SIMIX_Global {
 
   smx_process_t current_process;
   xbt_dict_t registered_functions;
-  smx_creation_func_t *create_process_function;
-  void_f_pvoid_t *kill_process_function;
-  void_f_pvoid_t *cleanup_process_function;
+  smx_creation_func_t create_process_function;
+  void_f_pvoid_t kill_process_function;
+  void_f_pvoid_t cleanup_process_function;
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
@@ -48,7 +48,7 @@ extern SIMIX_Global_t simix_global;
 /******************************* Process *************************************/
 
 typedef struct s_smx_simdata_process {
-  smx_host_t s_host;           /* the host on which the process is running */
+  smx_host_t smx_host;         /* the host on which the process is running */
   xbt_context_t context;       /* the context that executes the scheduler fonction */
   int blocked;
   int suspended;
@@ -56,6 +56,7 @@ typedef struct s_smx_simdata_process {
   smx_cond_t cond;             /* cond on which the process is blocked  */
   int argc;                    /* arguments number if any */
   char **argv;                 /* arguments table if any */
+  xbt_dict_t properties;
 } s_smx_simdata_process_t;
 
 typedef struct s_smx_process_arg {
@@ -66,6 +67,7 @@ typedef struct s_smx_process_arg {
   int argc;
   char **argv;
   double kill_time;
+  xbt_dict_t properties;
 } s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/