* \param rdv The rendez-vous point
* \return The communication or NULL if empty
*/
-smx_comm_t SIMIX_rdv_get_head(smx_rdv_t rdv)
+XBT_INLINE smx_comm_t SIMIX_rdv_get_head(smx_rdv_t rdv)
{
return (smx_comm_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(rdv->comm_fifo));
}
/** @brief adds some API-related data to the rendez-vous point */
-void SIMIX_rdv_set_data(smx_rdv_t rdv,void *data) {
+XBT_INLINE void SIMIX_rdv_set_data(smx_rdv_t rdv,void *data) {
rdv->data=data;
}
/** @brief gets API-related data from the rendez-vous point */
-void *SIMIX_rdv_get_data(smx_rdv_t rdv) {
+XBT_INLINE void *SIMIX_rdv_get_data(smx_rdv_t rdv) {
return rdv->data;
}
* \brief Cancels a communication
* \brief comm The communication to cancel
*/
-void SIMIX_communication_cancel(smx_comm_t comm)
+XBT_INLINE void SIMIX_communication_cancel(smx_comm_t comm)
{
SIMIX_action_cancel(comm->act);
}
* \brief get the amount remaining from the communication
* \param comm The communication
*/
-double SIMIX_communication_get_remains(smx_comm_t comm)
+XBT_INLINE double SIMIX_communication_get_remains(smx_comm_t comm)
{
return SIMIX_action_get_remains(comm->act);
}
* \param comm The communication
* \return the user data
*/
-void *SIMIX_communication_get_data(smx_comm_t comm)
+XBT_INLINE void *SIMIX_communication_get_data(smx_comm_t comm)
{
return comm->data;
}
* - timeout_error if communication reached the timeout specified
* - network_error if network failed or peer issued a timeout
*/
-void SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate,
+XBT_INLINE 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_ref, void *data)
{
* - timeout_error if communication reached the timeout specified
* - network_error if network failed or peer issued a timeout
*/
-void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff,
+XBT_INLINE void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff,
size_t *dst_buff_size, smx_comm_t *comm_ref)
{
*comm_ref = SIMIX_network_irecv(rdv,dst_buff,dst_buff_size);
}
/** @brief blocks until the communication terminates or the timeout occurs */
-void SIMIX_network_wait(smx_comm_t comm, double timeout) {
+XBT_INLINE void SIMIX_network_wait(smx_comm_t comm, double timeout) {
/* Wait for communication completion */
SIMIX_communication_wait_for_completion(comm, timeout);
}
/** @Returns whether the (asynchronous) communication is done yet or not */
-int SIMIX_network_test(smx_comm_t comm) {
+XBT_INLINE int SIMIX_network_test(smx_comm_t comm) {
return comm->sem?SIMIX_sem_would_block(comm->sem):0;
}
/** @brief wait for the completion of any communication of a set
*
- * @Returns the communication which finished, destroy it after identifying which one it is (not removed from the dynar)
+ * @Returns the rank in the dynar of communication which finished; destroy it after identifying which one it is
*/
-smx_comm_t SIMIX_network_waitany(xbt_dynar_t comms) {
+unsigned int SIMIX_network_waitany(xbt_dynar_t comms) {
xbt_dynar_t sems = xbt_dynar_new(sizeof(smx_sem_t),NULL);
- unsigned int cursor;
+ unsigned int cursor, found_comm=-1;
smx_comm_t comm,comm_finished=NULL;
- smx_sem_t sem;
xbt_dynar_foreach(comms,cursor,comm){
xbt_dynar_push(sems,&(comm->sem));
DEBUG1("Waiting for the completion of communication set %p", comms);
- sem = SIMIX_sem_acquire_any(sems);
- xbt_dynar_foreach(comms,cursor,comm){
- if (comm->sem == sem) {
- comm_finished = comm;
- }
- }
- xbt_assert0(comm_finished,"Cannot find which communication finished");
+ found_comm = SIMIX_sem_acquire_any(sems);
+ xbt_assert0(found_comm!=-1,"Cannot find which communication finished");
+ xbt_dynar_get_cpy(comms,found_comm,&comm_finished);
DEBUG1("Communication %p complete! Let's check for errors", comm_finished);
* and that nobody will ever block on it */
SIMIX_sem_release_forever(comm_finished->sem);
- /* Check for errors other than timeouts (they are catched above) */
+ /* Check for errors */
if(!SIMIX_host_get_state(SIMIX_host_self())){
if(comm_finished->rdv)
SIMIX_rdv_remove(comm_finished->rdv, comm_finished);
THROW0(network_error, 0, "Link failure");
}
- return comm_finished;
+ return found_comm;
}