use a dict to store the smx_hosts since we lookup by name

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

diff --git a/src/simix/private.h b/src/simix/private.h
index e2d7d04..dd2c343 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -1,4 +1,4 @@
-/*     $Id$     */
+/*     $Id: private.h 5071 2007-11-27 15:41:57Z mquinson $      */
 
 /* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
    All rights reserved.                                          */
@@ -32,15 +32,15 @@ typedef struct s_smx_simdata_host {
 /********************************* 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;
+  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;
@@ -56,6 +56,7 @@ typedef struct s_smx_simdata_process {
   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 s_smx_process_arg {
@@ -66,6 +67,7 @@ typedef struct s_smx_process_arg {
   int argc;
   char **argv;
   double kill_time;
+  xbt_dict_t properties;
 } s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/
@@ -110,13 +112,13 @@ 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.")
 
 smx_host_t __SIMIX_host_create(const char *name, void *workstation,
                               void *data);
-void __SIMIX_host_destroy(smx_host_t host);
+void __SIMIX_host_destroy(void* host);
 
 void __SIMIX_cond_wait(smx_cond_t cond);