From 852138539bcbd3a5bc0fd928ab7bf99e0883b38e Mon Sep 17 00:00:00 2001 From: eyraudl Date: Fri, 10 Nov 2006 12:40:28 +0000 Subject: [PATCH] Makes sure that data sent on measurement socket is exactly the experience size required. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2918 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Transport/transport.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 19b6be77de..41bed37eb4 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -461,7 +461,8 @@ void gras_socket_meas_send(gras_socket_t peer, unsigned long int msg_size) { char *chunk=NULL; unsigned long int exp_sofar; - + unsigned long int chunk_size = 0; + XBT_IN; if (gras_if_RL()) @@ -470,11 +471,14 @@ void gras_socket_meas_send(gras_socket_t peer, xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket"); xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())"); - for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", + for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += chunk_size) { + chunk_size = exp_sofar + msg_size > exp_size ? + exp_size - exp_sofar : msg_size; + CDEBUG6(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d, sending %lu", exp_sofar,exp_size,msg_size, - gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - (*peer->plugin->raw_send)(peer,chunk,msg_size); + gras_socket_peer_name(peer), gras_socket_peer_port(peer), + chunk_size); + (*peer->plugin->raw_send)(peer,chunk,chunk_size); } CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", exp_sofar,exp_size,msg_size, @@ -498,6 +502,7 @@ void gras_socket_meas_recv(gras_socket_t peer, char *chunk=NULL; unsigned long int exp_sofar; + unsigned long int chunk_size = 0; XBT_IN; @@ -508,11 +513,14 @@ void gras_socket_meas_recv(gras_socket_t peer, "Asked to receive measurement data on a regular socket"); xbt_assert0(peer->incoming,"Socket not suited for data receive"); - for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", + for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += chunk_size) { + chunk_size = exp_sofar + msg_size > exp_size ? + exp_size - exp_sofar : msg_size; + CDEBUG6(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d, receiving %lu", exp_sofar,exp_size,msg_size, - gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - (peer->plugin->raw_recv)(peer,chunk,msg_size); + gras_socket_peer_name(peer), gras_socket_peer_port(peer), + chunk_size); + (peer->plugin->raw_recv)(peer,chunk,chunk_size); } CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", exp_sofar,exp_size,msg_size, -- 2.20.1