This change exports the gras_procdata pointer and use the Win32 function GetCurrentPr...

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

diff --git a/src/simix/private.h b/src/simix/private.h
index e2d7d04..6938efd 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;
@@ -110,7 +110,7 @@ extern int _simix_init_status;      /* 0: beginning of time;
 extern xbt_cfg_t _simix_cfg_set;
 
 
-#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
+#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_model->extension_public-> \
                                  get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
                                   "Host failed, you cannot call this function.")