X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f85c01fa01dfbf9b06f6e8c1fa01e34f49647db..6d17036094433f0304c29b6f57922cee32b0c67c:/src/simix/private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index 0018fd3288..1c7ac7dc58 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -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"
@@ -16,6 +17,7 @@
 #include "xbt/dict.h"
 #include "xbt/context.h"
 #include "xbt/config.h"
+#include "xbt/function_types.h"
 
 /******************************* Datatypes **********************************/
 
@@ -36,6 +38,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;
@@ -43,7 +47,7 @@ extern SIMIX_Global_t simix_global;
 /******************************* Process *************************************/
 
 typedef struct s_smx_simdata_process {
-  smx_host_t host;                /* the host on which the process is running */
+  smx_host_t s_host;                /* the host on which the process is running */
   xbt_context_t context;	        /* the context that executes the scheduler fonction */
   int blocked;
   int suspended;
@@ -53,28 +57,34 @@ 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;
+  xbt_main_func_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 ****************************/
 
 typedef struct s_smx_mutex {
-	xbt_swag_t sleeping;			/* list of sleeping process */
-	int using;
+
+   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_mutex */
+   xbt_swag_t sleeping;			/* list of sleeping process */
+   int using;
+   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_mutex */
 
 } s_smx_mutex_t;
 
 typedef struct s_smx_cond {
-	xbt_swag_t sleeping; 			/* list of sleeping process */
-	smx_mutex_t  mutex;
-	xbt_fifo_t actions;			/* list of actions */
+   
+   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_cond */
+   xbt_swag_t sleeping; 			/* list of sleeping process */
+   smx_mutex_t  mutex;
+   xbt_fifo_t actions;			/* list of actions */
+   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_cond */
 
 } s_smx_cond_t;
 
@@ -99,7 +109,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.")
 
@@ -108,7 +118,4 @@ void __SIMIX_host_destroy(smx_host_t host);
 
 void __SIMIX_cond_wait(smx_cond_t cond);
 
-void __SIMIX_display_process_status(void);
-
-
 #endif