#include "xbt/misc.h"
#include "xbt/fifo.h"
+#include "xbt/dict.h"
#include "xbt/function_types.h"
#include "simix/datatypes.h"
#include "surf/surf.h"
* int argc, char **argv: parameters passed to code
*
* */
-typedef void *(smx_creation_func_t)(/*name*/ const char *,
+typedef void *(*smx_creation_func_t)(/*name*/ const char *,
/*code*/ xbt_main_func_t,
/*userdata*/ void *,
/*hostname*/ char *,
/* argc */ int,
- /* argv */ char **);
-XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t *function);
-XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_f_pvoid_t *function);
-XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_f_pvoid_t *function);
+ /* argv */ char **,
+ /* props */ xbt_dict_t);
+XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function);
+XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_f_pvoid_t function);
+XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_f_pvoid_t function);
/************************** Host handling ***********************************/
XBT_PUBLIC(void) SIMIX_create_environment(const char *file);
XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
+XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_properties(smx_host_t host);
+
/* Two possible states, 1 - CPU ON and 0 CPU OFF */
XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host);
/************************** Process handling *********************************/
XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
xbt_main_func_t code, void *data,
- const char * hostname, int argc, char **argv);
+ const char * hostname, int argc, char **argv, xbt_dict_t properties);
XBT_PUBLIC(void) SIMIX_jprocess_create(const char *name,
smx_host_t host,
XBT_PUBLIC(void) SIMIX_process_resume(smx_process_t process);
XBT_PUBLIC(int) SIMIX_process_is_suspended(smx_process_t process);
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) SIMIX_process_get_properties(smx_process_t host);
/************************** Synchro handling **********************************/
/************************** Action handling ************************************/
XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, const char *name,
double size, double rate);
-XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,char *name, double amount);
+XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host, const char *name, double amount);
XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount);
XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
void SIMIX_display_process_status(void);
-/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
-void SIMIX_process_set_jprocess(smx_process_t process, void *jp);
-void* SIMIX_process_get_jprocess(smx_process_t process);
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm);
-void* SIMIX_process_get_jmutex(smx_process_t process);
-void SIMIX_process_set_jcond(smx_process_t process, void *jc);
-void* SIMIX_process_get_jcond(smx_process_t process);
-void SIMIX_process_set_jenv(smx_process_t process, void *je);
-void* SIMIX_process_get_jenv(smx_process_t process);
-
SG_END_DECL()