* \param type The type of communication we are looking for (comm_send, comm_recv)
* \return The communication request if found, NULL otherwise.
*/
-smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rdv, smx_comm_type_t type)
-{
+smx_comm_t SIMIX_rdv_get_request(smx_rdv_t rdv, smx_comm_type_t type) {
smx_comm_t comm = (smx_comm_t)xbt_fifo_get_item_content(
xbt_fifo_get_first_item(rdv->comm_fifo));
return comm;
}
- /* no relevant request found. Return NULL */
DEBUG0("Communication request not found");
return NULL;
}
if(!comm->src_buff || !comm->dst_buff)
return;
- size_t src_buff_size = comm->src_buff_size;
- size_t dst_buff_size = *comm->dst_buff_size;
-
/* Copy at most dst_buff_size bytes of the message to receiver's buffer */
- dst_buff_size = MIN(dst_buff_size, src_buff_size);
+ size_t buff_size = comm->src_buff_size;
+ if (comm->dst_buff_size)
+ buff_size = MIN(buff_size,*(comm->dst_buff_size));
/* Update the receiver's buffer size to the copied amount */
if (comm->dst_buff_size)
- *comm->dst_buff_size = dst_buff_size;
+ *comm->dst_buff_size = buff_size;
- if(dst_buff_size == 0)
+ if(buff_size == 0)
return;
- memcpy(comm->dst_buff, comm->src_buff, dst_buff_size);
-
- DEBUG4("Copying comm %p data from %s -> %s (%zu bytes)",
- comm, comm->src_proc->smx_host->name, comm->dst_proc->smx_host->name,
- dst_buff_size);
+#ifdef HAVE_RUBY /* FIXME: KILLME */
+ INFO6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+ comm,
+ comm->src_proc->smx_host->name, comm->src_buff,
+ comm->dst_proc->smx_host->name, comm->dst_buff,
+ buff_size);
+#else
+ DEBUG6("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)",
+ comm,
+ comm->src_proc->smx_host->name, comm->src_buff,
+ comm->dst_proc->smx_host->name, comm->dst_buff,
+ buff_size);
+#endif
+ if (buff_size == sizeof(void*)) {
+ *(void**)(comm->dst_buff) = *(void**)(comm->src_buff);
+ } else {
+ memcpy(comm->dst_buff, comm->src_buff, buff_size);
+ }
}
/**