From 791f832cea6e18633bc614246193551293542bbd Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 23 Jun 2005 15:27:49 +0000 Subject: [PATCH 1/1] new function: gras_socket_meas_accept (mandatory on meas sockets, forbiden on others); don't bufferize meas sockets; be nice with valgrind and initialize the data we send, even if we don't care the values at all; all sizes are now unsigned long int git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1403 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Transport/transport.c | 80 ++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 18 deletions(-) diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index a04078b2a8..fda7851e7c 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -11,7 +11,7 @@ #include "gras/Transport/transport_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network"); -XBT_LOG_NEW_SUBCATEGORY(meas_trp,transport,"Conveying bytes over the network without formating for perf measurements"); +XBT_LOG_NEW_SUBCATEGORY(trp_meas,transport,"Conveying bytes over the network without formating for perf measurements"); static short int _gras_trp_started = 0; static xbt_dict_t _gras_trp_plugins; /* All registered plugins */ @@ -197,7 +197,9 @@ gras_socket_server_ext(unsigned short port, DEBUG2("Create a server socket from plugin %s on port %d", gras_if_RL() ? "tcp" : "sg", port); - TRY(gras_trp_plugin_get_by_name("buf",&trp)); + TRY(gras_trp_plugin_get_by_name((measurement? (gras_if_RL() ? "tcp" : "sg") + :"buf"), + &trp)); /* defaults settings */ gras_trp_socket_new(1,&sock); @@ -235,7 +237,7 @@ gras_socket_client_ext(const char *host, unsigned short port, unsigned long int bufSize, - int meas, + int measurement, /* OUT */ gras_socket_t *dst) { @@ -245,7 +247,9 @@ gras_socket_client_ext(const char *host, *dst = NULL; - TRY(gras_trp_plugin_get_by_name("buf",&trp)); + TRY(gras_trp_plugin_get_by_name((measurement? (gras_if_RL() ? "tcp" : "sg") + :"buf"), + &trp)); DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg"); /* defaults settings */ @@ -254,7 +258,7 @@ gras_socket_client_ext(const char *host, sock->peer_port = port; sock->peer_name = (char*)strdup(host?host:"localhost"); sock->bufSize = bufSize; - sock->meas = meas; + sock->meas = measurement; /* plugin-specific */ errcode= (*trp->socket_client)(trp, sock); @@ -392,24 +396,27 @@ xbt_error_t gras_socket_meas_send(gras_socket_t peer, unsigned long int exp_size, unsigned long int msg_size) { xbt_error_t errcode; - char *chunk = xbt_malloc(msg_size); - int exp_sofar; + char *chunk = xbt_malloc0(msg_size); + unsigned long int exp_sofar; - XBT_IN; + XBT_CIN(trp_meas); + xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket"); + for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); TRY(gras_trp_chunk_send(peer,chunk,msg_size)); } - CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); free(chunk); - XBT_OUT; - return no_error;/* gras_socket_meas_exchange(peer,1,timeout,expSize,msgSize); */ + + XBT_COUT(trp_meas); + return no_error; } xbt_error_t gras_socket_meas_recv(gras_socket_t peer, @@ -419,25 +426,62 @@ xbt_error_t gras_socket_meas_recv(gras_socket_t peer, xbt_error_t errcode; char *chunk = xbt_malloc(msg_size); - int exp_sofar; + unsigned long int exp_sofar; + + XBT_CIN(trp_meas); - XBT_IN; xbt_assert0(peer->meas,"Asked to receive measurement data on a regular socket\n"); + for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); TRY(gras_trp_chunk_recv(peer,chunk,msg_size)); } - CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); free(chunk); - XBT_OUT; - return no_error;/* gras_socket_meas_exchange(peer,0,timeout,expSize,msgSize); */ + XBT_COUT(trp_meas); + + return no_error; } +/** + * \brief Something similar to the good old accept system call. + * + * Make sure that there is someone speaking to the provided server socket. + * In RL, it does an accept(2), close the master socket, and put the accepted + * socket in place of the provided one. In SG, it does not do anything for + * + * You should only call this on measurement sockets. It is automatically + * done for regular sockets, but you usually want more control about + * what's going on with measurement sockets. + * + * + */ +xbt_error_t gras_socket_meas_accept(gras_socket_t peer, gras_socket_t *accepted){ + xbt_error_t errcode; + gras_socket_t res; + + xbt_assert0(peer->meas, + "No need to accept on non-measurement sockets (it's automatic)"); + + if (!peer->accepting) { + /* nothing to accept here */ + *accepted=peer; + return no_error; + } + + TRY((peer->plugin->socket_accept)(peer,accepted)); + (*accepted)->meas = peer->meas; + CDEBUG1(trp_meas,"meas_accepted onto %d",(*accepted)->sd); + + return no_error; +} + + /* * Creating procdata for this module */ -- 2.20.1