X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..94974c282c6e6d096238716853bb053330170d76:/src/gras/Msg/sg_msg.c diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c index 0321d91e5d..0af9f97c86 100644 --- a/src/gras/Msg/sg_msg.c +++ b/src/gras/Msg/sg_msg.c @@ -20,7 +20,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_msg); typedef void *gras_trp_bufdata_; #include "simix/datatypes.h" -#include "simix/private.h" /* Yeah, the following is awfull, breaking the encapsulation of at least 3 modules * at the same time, but I'm tracking this bug since too long now, I want it dead. now. @@ -146,7 +145,7 @@ gras_msg_t gras_msg_recv_any(void) * an iterator, incremented only when the socket has a comm. And we've the right socket * when that iterator is equal to "got", the result of waitany. Not needed if B holds. */ - xbt_assert1(sock_data->comm_recv, + xbt_assert(sock_data->comm_recv, "Comm_recv of socket %p is empty; please report that nasty bug", sock); /* End of paranoia */ @@ -238,7 +237,7 @@ void gras_msg_send_ext(gras_socket_t sock, payload, msg->payl); } - comm = SIMIX_req_comm_isend(target_rdv, whole_payload_size, -1, msg, sizeof(void *), NULL, msg, 0); + comm = SIMIX_req_comm_isend(target_rdv, whole_payload_size, -1, msg, sizeof(void *), NULL,NULL, msg, 0); SIMIX_req_comm_wait(comm, -1); XBT_VERB("Message sent (and received)");