Add a new workstation model. Should give much more reasonnable results for parallel...

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

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 4fefabb..ec89b6f 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -45,8 +45,15 @@ XBT_PUBLIC(void) __SIMIX_main(void);
  * int argc, char **argv: parameters passed to code
  *
  * */
-XBT_PUBLIC(void) SIMIX_function_register_process_create(void * function);
-XBT_PUBLIC(void) SIMIX_function_register_process_kill(void * function);
+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);
 
 /************************** Host handling ***********************************/
 
@@ -70,14 +77,12 @@ 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,
-                                              void * clean_process_function);
+                                              const char * hostname, int argc, char **argv);
 
 XBT_PUBLIC(void) SIMIX_jprocess_create(const char *name, 
                                       smx_host_t host,
                                       void *data,
                                       void *jprocess, void *jenv,
-                                      void * clean_process_function,
                                       smx_process_t* res);
 
 XBT_PUBLIC(void) SIMIX_process_kill(smx_process_t process);
@@ -113,7 +118,6 @@ XBT_PUBLIC(void) SIMIX_cond_wait(smx_cond_t cond,smx_mutex_t mutex);
 XBT_PUBLIC(void) SIMIX_cond_wait_timeout(smx_cond_t cond,smx_mutex_t mutex, double max_duration);
 XBT_PUBLIC(void) SIMIX_cond_broadcast(smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_cond_destroy(smx_cond_t cond);
-XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
 XBT_PUBLIC(xbt_fifo_t) SIMIX_cond_get_actions(smx_cond_t cond);
 
 
@@ -126,6 +130,7 @@ XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
 XBT_PUBLIC(void) SIMIX_action_destroy(smx_action_t action);
 XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
+XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action, smx_cond_t cond);
 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);