-/* $Id$ */
+/* $Id: private.h 5071 2007-11-27 15:41:57Z mquinson $ */
/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
All rights reserved. */
/********************************* 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;
/******************************* 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;
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 {
int argc;
char **argv;
double kill_time;
+ xbt_dict_t properties;
} s_smx_process_arg_t, *smx_process_arg_t;
/********************************* Mutex and Conditional ****************************/
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);
+void __SIMIX_cond_display_actions(smx_cond_t cond);
+void __SIMIX_action_display_conditions(smx_action_t action);
+
#endif