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);
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_PUBLIC(smx_process_t) SIMIX_process_self(void);
+XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void);
-XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data);
-XBT_PUBLIC(void*) SIMIX_process_self_get_data(void);
-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,
- xbt_dict_t properties);
+XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data);
+XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self);
XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t);
XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c);
+XBT_PUBLIC(int) SIMIX_process_has_pending_comms(smx_process_t process);
/****************************** Communication *********************************/
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(void) smpi_comm_copy_data_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 */
XBT_PUBLIC(void) SIMIX_req_host_set_data(smx_host_t host, void *data);
XBT_PUBLIC(smx_action_t) SIMIX_req_host_execute(const char *name, smx_host_t host,
- double computation_amount);
+ double computation_amount,
+ double priority);
XBT_PUBLIC(smx_action_t) SIMIX_req_host_parallel_execute(const char *name,
int host_nb,
smx_host_t *host_list,
XBT_PUBLIC(double) SIMIX_req_host_execution_get_remains(smx_action_t execution);
XBT_PUBLIC(e_smx_state_t) SIMIX_req_host_execution_get_state(smx_action_t execution);
XBT_PUBLIC(void) SIMIX_req_host_execution_set_priority(smx_action_t execution, double priority);
-XBT_PUBLIC(void) SIMIX_req_host_execution_wait(smx_action_t execution);
+XBT_PUBLIC(e_smx_state_t) SIMIX_req_host_execution_wait(smx_action_t execution);
/**************************** Process Requests ********************************/
/* Constructor and Destructor */
-XBT_PUBLIC(smx_process_t) SIMIX_req_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- int argc, char **argv,
- xbt_dict_t properties);
+XBT_PUBLIC(void) SIMIX_req_process_create(smx_process_t *process,
+ const char *name,
+ xbt_main_func_t code,
+ void *data,
+ const char *hostname,
+ int argc, char **argv,
+ 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);
+ smx_host_t dest);
XBT_PUBLIC(void) SIMIX_req_process_suspend(smx_process_t process);
XBT_PUBLIC(void) SIMIX_req_process_resume(smx_process_t process);
/***** 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,
- void *data);
+ double rate, void *src_buff,
+ size_t src_buff_size,
+ int (*match_fun)(void *, void *),
+ void (*clean_fun)(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);
+ 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 */
/* Getters and setters */
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_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(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(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));
XBT_PUBLIC(int) SIMIX_req_comm_is_latency_bounded(smx_action_t comm);
#endif
+#ifdef HAVE_TRACING
+/************************** Tracing handling **********************************/
+XBT_PUBLIC(void) SIMIX_req_set_category(smx_action_t action, const char *category);
+#endif
+
/************************** Synchro handling **********************************/
XBT_PUBLIC(smx_mutex_t) SIMIX_req_mutex_init(void);
XBT_PUBLIC(unsigned int) SIMIX_req_sem_acquire_any(xbt_dynar_t sems);
XBT_PUBLIC(int) SIMIX_req_sem_get_capacity(smx_sem_t sem);
+const char *SIMIX_request_name(int kind);
+
SG_END_DECL()
#endif /* _SIMIX_SIMIX_H */
