X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be437b7fa306304527b4b99a22d4bd017586cd68..989ba32a142691acd6c1efb0227a94e516b9b94d:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 94290c5699..41bed37eb4 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -7,6 +7,11 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +/*** + *** Options + ***/ +int gras_opt_trp_nomoredata_on_close=0; + #include "xbt/ex.h" #include "xbt/peer.h" #include "portable.h" @@ -160,6 +165,7 @@ void gras_trp_socket_new(int incoming, sock->meas = 0; sock->recv_ok = 1; sock->valid = 1; + sock->moredata = 0; sock->sd = -1; sock->port = -1; @@ -173,7 +179,7 @@ void gras_trp_socket_new(int incoming, *dst = sock; xbt_dynar_push(((gras_trp_procdata_t) - gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst); + gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst); XBT_OUT; } @@ -344,6 +350,15 @@ void gras_socket_close(gras_socket_t sock) { XBT_IN; VERB1("Close %p",sock); + if (sock == _gras_lastly_selected_socket) { + xbt_assert0(!gras_opt_trp_nomoredata_on_close || !sock->moredata, + "Closing a socket having more data in buffer while the nomoredata_on_close option is activated"); + + if (sock->moredata) + CRITICAL0("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing."); + _gras_lastly_selected_socket=NULL; + } + /* FIXME: Issue an event when the socket is closed */ if (sock) { xbt_dynar_foreach(sockets,cursor,sock_iter) { @@ -446,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()) @@ -455,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, @@ -483,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; @@ -493,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,