* Cleanup the DTD by renaming:

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

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index ec89b6f..e431e68 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -11,6 +11,7 @@
 
 #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"
@@ -45,15 +46,16 @@ XBT_PUBLIC(void) __SIMIX_main(void);
  * 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 ***********************************/
 
@@ -71,13 +73,15 @@ XBT_PUBLIC(smx_host_t *)SIMIX_host_get_table(void);
 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,
@@ -101,6 +105,8 @@ XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process);
 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 **********************************/
 
@@ -122,7 +128,7 @@ XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond);
 
 
 /************************** Action handling ************************************/
-XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver, char *name,
+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_sleep(smx_host_t host, double amount);
@@ -135,10 +141,9 @@ XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
 
 XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
 
-/*Not implemented yet */
 XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name, 
-                                                      int workstation_nb,      
-                                                      void **workstation_list,
+                                                      int host_nb,      
+                                                      smx_host_t *host_list,
                                                       double *computation_amount,
                                                       double *communication_amount,
                                                       double amount,
@@ -149,10 +154,6 @@ 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);