X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779..00f0d2097c98d7d9951e186d58fd0c0dcb6f00f4:/src/simix/private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index 0b119fb842..bc0eccf50b 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -16,7 +16,6 @@
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/context.h"
-#include "xbt/config.h"
 #include "xbt/function_types.h"
 
 /******************************* Datatypes **********************************/
@@ -25,14 +24,14 @@
 /********************************** 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;
 
@@ -48,14 +47,14 @@ extern SIMIX_Global_t simix_global;
 /******************************* Process *************************************/
 
 typedef struct s_smx_simdata_process {
-  smx_host_t smx_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  */
-  int argc;			/* arguments number if any */
-  char **argv;			/* arguments table if any */
+  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;
 
@@ -75,8 +74,8 @@ typedef struct s_smx_process_arg {
 typedef struct s_smx_mutex {
 
   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_mutex */
-  xbt_swag_t sleeping;		/* list of sleeping process */
-  int using;
+  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;
@@ -84,9 +83,9 @@ typedef struct s_smx_mutex {
 typedef struct s_smx_cond {
 
   /* KEEP IT IN SYNC WITH src/xbt_sg_thread.c::struct s_xbt_cond */
-  xbt_swag_t sleeping;		/* list of sleeping process */
+  xbt_swag_t sleeping;          /* list of sleeping process */
   smx_mutex_t mutex;
-  xbt_fifo_t actions;		/* list of actions */
+  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;
@@ -94,7 +93,7 @@ typedef struct s_smx_cond {
 /********************************* Action **************************************/
 
 typedef struct s_smx_simdata_action {
-  surf_action_t surf_action;	/* SURF modeling of computation  */
+  surf_action_t surf_action;    /* SURF modeling of computation  */
 
   smx_host_t source;
 
@@ -102,29 +101,20 @@ typedef struct s_smx_simdata_action {
 
 
 
-/******************************* Configuration support **********************************/
+/******************************* Other **********************************/
 
-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;
 
-
-#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_model->extension_public-> \
-				  get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
+#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_model->extension.workstation. \
+				  get_state(SIMIX_host_self()->simdata->host)==SURF_RESOURCE_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);
+                               void *data);
+void __SIMIX_host_destroy(void *host);
 
 void __SIMIX_cond_wait(smx_cond_t cond);
 
 void __SIMIX_cond_display_actions(smx_cond_t cond);
 void __SIMIX_action_display_conditions(smx_action_t action);
 
-xbt_dict_t current_property_set;
-
 #endif