X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31b7fa457f9267af8eda2eee06aae74dd78eb412..ebfe21b41d7a8b25b72d2441f9bee879d974809f:/include/simix/simix.h

diff --git a/include/simix/simix.h b/include/simix/simix.h
index 034000910d..967dd5dbe2 100644
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -24,7 +24,7 @@ XBT_PUBLIC(void) SIMIX_clean(void);
 
 XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function);
 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_kill(void_pfn_smxprocess_t function);
 
 /* Simulation execution */
 XBT_PUBLIC(void) SIMIX_run(void);    
@@ -60,7 +60,6 @@ XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data);
 XBT_PUBLIC(void*) SIMIX_host_self_get_data(void);
 
 /********************************* Process ************************************/
-XBT_PUBLIC(void) SIMIX_process_cleanup(smx_process_t arg);
 XBT_PUBLIC(int) SIMIX_process_count(void);
 XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
@@ -73,6 +72,10 @@ XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
 XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, size_t));
 XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size);
 XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_action_t comm, size_t buff_size);
+XBT_PUBLIC(smx_action_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
+XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
+XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data);
+XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action);
 
 /******************************************************************************/
 /*                        SIMIX Smurf Proxy Functions                         */
@@ -126,9 +129,10 @@ XBT_PUBLIC(void) SIMIX_req_process_create(smx_process_t *process,
                                           xbt_dict_t properties);
 
 XBT_PUBLIC(void) SIMIX_req_process_kill(smx_process_t process);
+XBT_PUBLIC(void) SIMIX_req_process_killall(void);
 
 /* Process handling */
-XBT_PUBLIC(void) SIMIX_req_process_cleanup(void *arg); /* FIXME: This function shouldn't be called from outside SIMIX */
+XBT_PUBLIC(void) SIMIX_req_process_cleanup(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_req_process_change_host(smx_process_t process,
                                            const char *source, const char *dest);
 XBT_PUBLIC(void) SIMIX_req_process_suspend(smx_process_t process);
@@ -156,21 +160,30 @@ XBT_PUBLIC(smx_action_t) SIMIX_req_rdv_get_head(smx_rdv_t rdv);
 
 /***** Communication Requests *****/
 
-/* Constructors and Destructor */
+XBT_PUBLIC(void) SIMIX_req_comm_send(smx_rdv_t rdv, double task_size,
+                                     double rate, void *src_buff,
+                                     size_t src_buff_size,
+                                     int (*match_fun)(void *, void *),
+                                     void *data, double timeout);
+
 XBT_PUBLIC(smx_action_t) SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size,
-                                           double rate, void *src_buff,
-                                           size_t src_buff_size,
-                                           int (*match_fun)(void *, void *),
-                                           void *data, int detached);
+                                              double rate, void *src_buff,
+                                              size_t src_buff_size,
+                                              int (*match_fun)(void *, void *),
+                                              void *data, int detached);
+
+XBT_PUBLIC(void) SIMIX_req_comm_recv(smx_rdv_t rdv, void *dst_buff,
+                                     size_t * dst_buff_size,
+                                     int (*match_fun)(void *, void *),
+                                     void *data, double timeout);
 
 XBT_PUBLIC(smx_action_t) SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff,
-                                           size_t * dst_buff_size,
-                                           int (*match_fun)(void *, void *),
-                                           void *data);
+                                              size_t * dst_buff_size,
+                                              int (*match_fun)(void *, void *),
+                                              void *data);
 
 XBT_PUBLIC(void) SIMIX_req_comm_destroy(smx_action_t comm);
 
-/* Communication handling */
 XBT_INLINE XBT_PUBLIC(void) SIMIX_req_comm_cancel(smx_action_t comm);
 
 /* FIXME: waitany is going to be a vararg function, and should take a timeout */
@@ -184,10 +197,6 @@ XBT_PUBLIC(double) SIMIX_req_comm_get_remains(smx_action_t comm);
 XBT_PUBLIC(e_smx_state_t) SIMIX_req_comm_get_state(smx_action_t comm);
 XBT_PUBLIC(void *) SIMIX_req_comm_get_src_data(smx_action_t comm);
 XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_data(smx_action_t comm);
-XBT_PUBLIC(void *) SIMIX_req_comm_get_src_buff(smx_action_t comm);
-XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_buff(smx_action_t comm);
-XBT_PUBLIC(size_t) SIMIX_req_comm_get_src_buff_size(smx_action_t comm);
-XBT_PUBLIC(size_t) SIMIX_req_comm_get_dst_buff_size(smx_action_t comm);
 XBT_PUBLIC(smx_process_t) SIMIX_req_comm_get_src_proc(smx_action_t comm);
 XBT_PUBLIC(smx_process_t) SIMIX_req_comm_get_dst_proc(smx_action_t comm);
 XBT_PUBLIC(void) SIMIX_req_comm_set_copy_data_callback(void (*callback)(smx_action_t,size_t));