X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d17036094433f0304c29b6f57922cee32b0c67c..25dad2df2f0ab55b6f5e3e00ad8a873c66368cc0:/src/include/simix/simix.h

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 4fefabbe8c..616db0ad5f 100644
--- 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,12 +118,11 @@ 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);
 
 
 /************************** 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);
@@ -126,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,
@@ -144,10 +148,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);