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

diff --git a/src/simix/private.h b/src/simix/private.h
index 0018fd3288..88655fe974 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -9,13 +9,14 @@
 #ifndef SIMIX_PRIVATE_H
 #define SIMIX_PRIVATE_H
 
+#include <stdio.h>
 #include "simix/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/context.h"
-#include "xbt/config.h"
+#include "xbt/function_types.h"
 
 /******************************* Datatypes **********************************/
 
@@ -23,19 +24,22 @@
 /********************************** Host ************************************/
 
 typedef struct s_smx_simdata_host {
-  void *host;			/* SURF modeling */
+  void *host;                   /* SURF modeling */
   xbt_swag_t process_list;
 } s_smx_simdata_host_t;
 
 /********************************* Simix Global ******************************/
 
 typedef struct SIMIX_Global {
-  xbt_fifo_t host;
+  xbt_dict_t host;
   xbt_swag_t process_to_run;
   xbt_swag_t process_list;
 
   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;
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
@@ -43,72 +47,74 @@ 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 */
-  xbt_context_t context;	        /* the context that executes the scheduler fonction */
+  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;
-  smx_mutex_t mutex;		/* mutex on which the process is blocked  */
-  smx_cond_t cond;		/* cond on which the process is blocked  */
+  smx_mutex_t mutex;            /* mutex on which the process is blocked  */
+  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 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;
+  xbt_dict_t properties;
+} 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 refcount;
+  /* 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;
 
 /********************************* Action **************************************/
 
 typedef struct s_smx_simdata_action {
-  surf_action_t surf_action;	/* SURF modeling of computation  */
-  
-  smx_host_t source; 
+  surf_action_t surf_action;    /* SURF modeling of computation  */
 
-} s_smx_simdata_action_t;
+  smx_host_t source;
 
+} s_smx_simdata_action_t;
 
 
-/******************************* Configuration support **********************************/
 
-void simix_config_init(void); /* create the config set, call this before use! */
-void simix_config_finalize(void); /* destroy the config set, call this at cleanup. */
-extern int _simix_init_status; /* 0: beginning of time; 
-                                1: pre-inited (cfg_set created); 
-                                2: inited (running) */
-extern xbt_cfg_t _simix_cfg_set;
+/******************************* Other **********************************/
 
 
-#define 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.")
 
-smx_host_t __SIMIX_host_create(const char *name, void *workstation, void *data);
-void __SIMIX_host_destroy(smx_host_t host);
+smx_host_t __SIMIX_host_create(const char *name, void *workstation,
+                               void *data);
+void __SIMIX_host_destroy(void *host);
 
 void __SIMIX_cond_wait(smx_cond_t cond);
 
-void __SIMIX_display_process_status(void);
-
+void __SIMIX_cond_display_actions(smx_cond_t cond);
+void __SIMIX_action_display_conditions(smx_action_t action);
 
 #endif