summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6ecb542)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2918
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
unsigned long int msg_size) {
char *chunk=NULL;
unsigned long int exp_sofar;
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())
XBT_IN;
if (gras_if_RL())
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())");
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,
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,
}
CDEBUG5(gras_trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
exp_sofar,exp_size,msg_size,
char *chunk=NULL;
unsigned long int exp_sofar;
char *chunk=NULL;
unsigned long int exp_sofar;
+ unsigned long int chunk_size = 0;
"Asked to receive measurement data on a regular socket");
xbt_assert0(peer->incoming,"Socket not suited for data receive");
"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,
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,
}
CDEBUG5(gras_trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d",
exp_sofar,exp_size,msg_size,