Fix SIMIX_network_copy_data against SMPI (to be tested against ruby bindings).

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

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 82785d0..7c965fe 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -79,7 +79,7 @@ XBT_PUBLIC(smx_host_t *) SIMIX_host_get_table(void);
 XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_dict(void);
 
 XBT_PUBLIC(void) SIMIX_create_environment(const char *file);
-XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
+XBT_INLINE XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
 
 XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_properties(smx_host_t host);
 
@@ -104,9 +104,9 @@ XBT_PUBLIC(void) SIMIX_process_change_host(smx_process_t process,
 XBT_PUBLIC(void *) SIMIX_process_get_data(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_process_set_data(smx_process_t process, void *data);
 
-XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process);
+XBT_INLINE XBT_PUBLIC(smx_host_t) SIMIX_process_get_host(smx_process_t process);
 XBT_PUBLIC(const char *) SIMIX_process_get_name(smx_process_t process);
-XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
+XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void);
 
 XBT_PUBLIC(void) SIMIX_process_yield(void);
 XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process);
@@ -146,6 +146,7 @@ XBT_PUBLIC(void) SIMIX_sem_destroy(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_release(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_release_forever(smx_sem_t sem);
 XBT_PUBLIC(int) SIMIX_sem_would_block(smx_sem_t sem);
+XBT_PUBLIC(void) SIMIX_sem_block_onto(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_acquire(smx_sem_t sem);
 XBT_PUBLIC(void) SIMIX_sem_acquire_timeout(smx_sem_t sem, double max_duration);
 XBT_PUBLIC(unsigned int) SIMIX_sem_acquire_any(xbt_dynar_t sems);
@@ -172,7 +173,7 @@ XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action,
 XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action,
                                                       smx_cond_t cond);
 XBT_PUBLIC(void) SIMIX_register_action_to_semaphore(smx_action_t action, smx_sem_t sem);
-XBT_PUBLIC(void) SIMIX_unregister_action_to_semaphore(smx_action_t action, smx_sem_t sem);
+XBT_INLINE XBT_PUBLIC(void) SIMIX_unregister_action_to_semaphore(smx_action_t action, smx_sem_t sem);
 
 
 XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
@@ -205,11 +206,14 @@ XBT_PUBLIC(void) SIMIX_rdv_set_data(smx_rdv_t rdv,void *data);
 XBT_PUBLIC(void*) SIMIX_rdv_get_data(smx_rdv_t rdv);
 
 /*****Communication Requests*****/
-XBT_PUBLIC(void) SIMIX_communication_cancel(smx_comm_t comm);
+XBT_INLINE XBT_PUBLIC(void) SIMIX_communication_cancel(smx_comm_t comm);
 XBT_PUBLIC(double) SIMIX_communication_get_remains(smx_comm_t comm);
 XBT_PUBLIC(void *) SIMIX_communication_get_data(smx_comm_t comm);
 
 /*****Networking*****/
+XBT_PUBLIC(void) SIMIX_network_set_copy_data_callback(void (*callback)(smx_comm_t, size_t));
+XBT_PUBLIC(void) SIMIX_network_copy_pointer_callback(smx_comm_t comm, size_t buff_size);
+XBT_PUBLIC(void) SIMIX_network_copy_buffer_callback(smx_comm_t comm, size_t buff_size);
 XBT_PUBLIC(void) SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate,
                                     double timeout, void *src_buff,
                                     size_t src_buff_size, smx_comm_t *comm, void *data);
@@ -219,7 +223,7 @@ XBT_PUBLIC(smx_comm_t) SIMIX_network_isend(smx_rdv_t rdv, double task_size, doub
                                            void *src_buff, size_t src_buff_size, void *data);
 XBT_PUBLIC(smx_comm_t) SIMIX_network_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size);
 XBT_PUBLIC(unsigned int) SIMIX_network_waitany(xbt_dynar_t comms);
-XBT_PUBLIC(void) SIMIX_network_wait(smx_comm_t comm, double timeout);
+XBT_INLINE XBT_PUBLIC(void) SIMIX_network_wait(smx_comm_t comm, double timeout);
 XBT_PUBLIC(int) SIMIX_network_test(smx_comm_t comm);
 
 SG_END_DECL()