Return action state on SIMIX_req_host_execution_wait().

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

diff --git a/include/simix/simix.h b/include/simix/simix.h
index 8270b26..4d95ee6 100644 (file)
--- a/include/simix/simix.h
+++ b/include/simix/simix.h
@@ -62,16 +62,10 @@ 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(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);
 
@@ -104,7 +98,8 @@ XBT_PUBLIC(void *) SIMIX_req_host_get_data(smx_host_t host);
 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,
@@ -117,7 +112,7 @@ XBT_PUBLIC(void) SIMIX_req_host_execution_cancel(smx_action_t execution);
 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 ********************************/
@@ -164,10 +159,13 @@ XBT_PUBLIC(smx_action_t) SIMIX_req_rdv_get_head(smx_rdv_t rdv);
 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);
 
 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);
 
@@ -183,7 +181,8 @@ XBT_PUBLIC(int) SIMIX_req_comm_testany(xbt_dynar_t comms);
 /* 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_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);
@@ -232,5 +231,7 @@ XBT_PUBLIC(void) SIMIX_req_sem_acquire_timeout(smx_sem_t sem,
 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 */