X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e16ebb1333db2cee332bbfed4098df88777cec22..3368ca8f8b3fb922a94a217f0afc3243ae18c8f5:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 71cff82779..8d05ad25bb 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -220,48 +220,32 @@ e_smx_state_t execute(double flops) { } void* recv(MailboxPtr chan) { - void *res = nullptr; - CommPtr c = Comm::recv_init(chan); - c->setDstData(&res, sizeof(res)); - c->wait(); - return res; + return chan->recv(); } void* recv(MailboxPtr chan, double timeout) { - void* res = nullptr; - CommPtr c = Comm::recv_init(chan); - c->setDstData(&res, sizeof(res)); - c->wait(timeout); - return res; + return chan->recv(timeout); } void send(MailboxPtr chan, void* payload, double simulatedSize) { - CommPtr c = Comm::send_init(chan); - c->setRemains(simulatedSize); - c->setSrcData(payload); - // c->start() is optional. - c->wait(); + chan->send(payload, simulatedSize); } void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) { - CommPtr c = Comm::send_init(chan); - c->setRemains(simulatedSize); - c->setSrcData(payload); - // c->start() is optional. - c->wait(timeout); + chan->send(payload, simulatedSize, timeout); } CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) { - return Comm::send_async(chan, payload, simulatedSize); + return chan->send_async(payload, simulatedSize); } CommPtr irecv(MailboxPtr chan, void** data) { - return Comm::recv_async(chan, data); + return chan->recv_async(data); } aid_t pid()