Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
avoid any name clashes with msg/private.h so that the java interface can do crude...
[simgrid.git] / src / simix / private.h
index 0018fd3..48dfde9 100644 (file)
@@ -9,6 +9,7 @@
 #ifndef SIMIX_PRIVATE_H
 #define SIMIX_PRIVATE_H
 
+#include <stdio.h>
 #include "simix/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
@@ -36,6 +37,8 @@ typedef struct SIMIX_Global {
 
   smx_process_t current_process;
   xbt_dict_t registered_functions;
+       void* (*create_process_function) ();
+       void* (*kill_process_function)();
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
@@ -53,15 +56,15 @@ typedef struct s_smx_simdata_process {
   char **argv;                  /* arguments table if any */
 } s_smx_simdata_process_t;
 
-typedef struct process_arg {
+typedef struct s_smx_process_arg {
   const char *name;
   smx_process_code_t code;
   void *data;
-  smx_host_t host;
+  char *hostname;
   int argc;
   char **argv;
   double kill_time;
-} s_process_arg_t, *process_arg_t;
+} s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/
 
@@ -99,7 +102,7 @@ extern int _simix_init_status; /* 0: beginning of time;
 extern xbt_cfg_t _simix_cfg_set;
 
 
-#define CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
+#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
                                  get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
                                   "Host failed, you cannot call this function.")
 
@@ -111,4 +114,5 @@ void __SIMIX_cond_wait(smx_cond_t cond);
 void __SIMIX_display_process_status(void);
 
 
+
 #endif