Fix parallel task problem with SIMIX raised by F. Suter

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

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index d7be651..8c58a85 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/function_types.h"
 #include "simix/datatypes.h"
 #include "surf/surf.h"
 
@@ -21,8 +22,8 @@ SG_BEGIN_DECL()
 XBT_PUBLIC(void) SIMIX_config(const char *name, va_list pa);
 XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv);
 XBT_PUBLIC(void) SIMIX_clean(void);
-XBT_PUBLIC(void) SIMIX_function_register(const char *name, smx_process_code_t code);
-XBT_PUBLIC(smx_process_code_t) SIMIX_get_registered_function(const char *name);
+XBT_PUBLIC(void) SIMIX_function_register(const char *name, xbt_main_func_t code);
+XBT_PUBLIC(xbt_main_func_t) SIMIX_get_registered_function(const char *name);
 
 XBT_PUBLIC(void) SIMIX_launch_application(const char *file);
 
@@ -38,14 +39,21 @@ XBT_PUBLIC(void) __SIMIX_main(void);
 
 /* User create and kill process, the function must accept the folling parameters:
  * const char *name: a name for the object. It is for user-level information and can be NULL
- * smx_process_code_t code: is a function describing the behavior of the agent
+ * xbt_main_func_t code: is a function describing the behavior of the agent
  * void *data: data a pointer to any data one may want to attach to the new object.
  * smx_host_t host: the location where the new agent is executed
  * 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 ***********************************/
 
@@ -68,15 +76,13 @@ XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host);
 
 /************************** Process handling *********************************/
 XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
-                                              smx_process_code_t code, void *data,
-                                              const char * hostname, int argc, char **argv,
-                                              void * clean_process_function);
+                                              xbt_main_func_t code, void *data,
+                                              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);
@@ -112,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);
 
 
@@ -125,14 +130,14 @@ 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);
 
-/*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,