X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0cc6b4b0df3ab644470c0472b7d5a0e2f68e02b3..5c145db0b251fcbd6c859b25262651aaa5230fa9:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index d88a401c1e..476780fefc 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -8,11 +8,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/ex.h" +#include "xbt/peer.h" #include "portable.h" #include "gras/Transport/transport_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network"); -XBT_LOG_NEW_SUBCATEGORY(trp_meas,transport,"Conveying bytes over the network without formating for perf measurements"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp,gras,"Conveying bytes over the network"); +XBT_LOG_NEW_SUBCATEGORY(gras_trp_meas,gras_trp,"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 */ @@ -81,12 +82,9 @@ void gras_trp_init(void){ #endif /* Add plugins */ - gras_trp_plugin_new("tcp", gras_trp_tcp_setup); gras_trp_plugin_new("file",gras_trp_file_setup); gras_trp_plugin_new("sg",gras_trp_sg_setup); - - /* buf is composed, so it must come after the others */ - gras_trp_plugin_new("buf", gras_trp_buf_setup); + gras_trp_plugin_new("tcp", gras_trp_tcp_setup); } _gras_trp_started++; @@ -94,7 +92,7 @@ void gras_trp_init(void){ void gras_trp_exit(void){ - xbt_dynar_t sockets = gras_socketset_get(); + xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; gras_socket_t sock_iter; int cursor; @@ -152,7 +150,7 @@ void gras_trp_socket_new(int incoming, gras_socket_t sock=xbt_new0(s_gras_socket_t,1); - DEBUG1("Create a new socket (%p)", (void*)sock); + VERB1("Create a new socket (%p)", (void*)sock); sock->plugin = NULL; @@ -160,32 +158,37 @@ void gras_trp_socket_new(int incoming, sock->outgoing = incoming ? 0:1; sock->accepting = incoming ? 1:0; sock->meas = 0; + sock->recv_ok = 1; + sock->valid = 1; sock->sd = -1; sock->port = -1; sock->peer_port = -1; sock->peer_name = NULL; + sock->peer_proc = NULL; sock->data = NULL; sock->bufdata = NULL; *dst = sock; - xbt_dynar_push(gras_socketset_get(),dst); + xbt_dynar_push(((gras_trp_procdata_t) + gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst); XBT_OUT; } - - + /** - * gras_socket_server_ext: - * - * Opens a server socket and make it ready to be listened to. - * In real life, you'll get a TCP socket. + * @brief Opens a server socket and makes it ready to be listened to. + * @param port: port on which you want to listen + * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) + * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) + * + * In real life, you'll get a TCP socket. */ gras_socket_t gras_socket_server_ext(unsigned short port, - unsigned long int bufSize, + unsigned long int buf_size, int measurement) { xbt_ex_t e; @@ -195,13 +198,13 @@ gras_socket_server_ext(unsigned short port, DEBUG2("Create a server socket from plugin %s on port %d", gras_if_RL() ? "tcp" : "sg", port); - trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":(measurement?"tcp":"buf")); + trp = gras_trp_plugin_get_by_name(gras_if_SG() ? "sg":"tcp"); /* defaults settings */ gras_trp_socket_new(1,&sock); sock->plugin= trp; sock->port=port; - sock->bufSize = bufSize; + sock->buf_size = buf_size>0 ? buf_size : 32*1024; sock->meas = measurement; /* Call plugin socket creation function */ @@ -213,31 +216,74 @@ gras_socket_server_ext(unsigned short port, sock->outgoing?'y':'n', sock->accepting?'y':'n'); } CATCH(e) { + int cursor; + gras_socket_t sock_iter; + xbt_dynar_t socks = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; + xbt_dynar_foreach(socks, cursor, sock_iter) { + if (sock_iter==sock) + xbt_dynar_cursor_rm(socks,&cursor); + } free(sock); RETHROW; } + if (!measurement) + ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport = port; return sock; } +/** + * @brief Opens a server socket on any port in the given range + * + * @param minport: first port we will try + * @param maxport: last port we will try + * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) + * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) + * + * If none of the provided ports works, raises the exception got when trying the last possibility + */ +gras_socket_t +gras_socket_server_range(unsigned short minport, unsigned short maxport, + unsigned long int buf_size, int measurement) { + + int port; + gras_socket_t res=NULL; + xbt_ex_t e; + + for (port=minport; portplugin= trp; sock->peer_port = port; sock->peer_name = (char*)strdup(host?host:"localhost"); - sock->bufSize = bufSize; + sock->buf_size = buf_size>0 ? buf_size: 32*1024; sock->meas = measurement; /* plugin-specific */ @@ -271,28 +317,33 @@ gras_socket_client_ext(const char *host, */ gras_socket_t gras_socket_server(unsigned short port) { - return gras_socket_server_ext(port,32,0); + return gras_socket_server_ext(port,32*1024,0); } -/** - * gras_socket_client: - * - * Opens a client socket to a remote host. - * In real life, you'll get a TCP socket. - */ +/** @brief Opens a client socket to a remote host */ gras_socket_t gras_socket_client(const char *host, unsigned short port) { - return gras_socket_client_ext(host,port,32,0); + return gras_socket_client_ext(host,port,0,0); } +/** @brief Opens a client socket to a remote host specified as '\a host:\a port' */ +gras_socket_t +gras_socket_client_from_string(const char *host) { + xbt_peer_t p = xbt_peer_from_string(host); + gras_socket_t res = gras_socket_client_ext(p->name,p->port,0,0); + xbt_peer_free(p); + return res; +} +/** \brief Close socket */ void gras_socket_close(gras_socket_t sock) { - xbt_dynar_t sockets = gras_socketset_get(); + xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; gras_socket_t sock_iter; int cursor; XBT_IN; + VERB1("Close %p",sock); /* FIXME: Issue an event when the socket is closed */ if (sock) { xbt_dynar_foreach(sockets,cursor,sock_iter) { @@ -309,27 +360,22 @@ void gras_socket_close(gras_socket_t sock) { return; } } - WARN1("Ignoring request to free an unknown socket (%p)",sock); + WARN1("Ignoring request to free an unknown socket (%p). Execution stack:",sock); + xbt_backtrace_display(); } XBT_OUT; } /** - * gras_trp_chunk_send: + * gras_trp_send: * * Send a bunch of bytes from on socket + * (stable if we know the storage will keep as is until the next trp_flush) */ void -gras_trp_chunk_send(gras_socket_t sd, - char *data, - long int size) { - xbt_assert1(sd->outgoing, - "Socket not suited for data send (outgoing=%c)", - sd->outgoing?'y':'n'); - xbt_assert1(sd->plugin->chunk_send, - "No function chunk_send on transport plugin %s", - sd->plugin->name); - (*sd->plugin->chunk_send)(sd,data,size); +gras_trp_send(gras_socket_t sd, char *data, long int size, int stable) { + xbt_assert0(sd->outgoing,"Socket not suited for data send"); + (*sd->plugin->send)(sd,data,size,stable); } /** * gras_trp_chunk_recv: @@ -337,15 +383,9 @@ gras_trp_chunk_send(gras_socket_t sd, * Receive a bunch of bytes from a socket */ void -gras_trp_chunk_recv(gras_socket_t sd, - char *data, - long int size) { - xbt_assert0(sd->incoming, - "Socket not suited for data receive"); - xbt_assert1(sd->plugin->chunk_recv, - "No function chunk_recv on transport plugin %s", - sd->plugin->name); - (sd->plugin->chunk_recv)(sd,data,size,size); +gras_trp_recv(gras_socket_t sd, char *data, long int size) { + xbt_assert0(sd->incoming,"Socket not suited for data receive"); + (sd->plugin->recv)(sd,data,size); } /** @@ -355,7 +395,8 @@ gras_trp_chunk_recv(gras_socket_t sd, */ void gras_trp_flush(gras_socket_t sd) { - (sd->plugin->flush)(sd); + if (sd->plugin->flush) + (sd->plugin->flush)(sd); } gras_trp_plugin_t @@ -363,7 +404,7 @@ gras_trp_plugin_get_by_name(const char *name){ return xbt_dict_get(_gras_trp_plugins,name); } -int gras_socket_my_port (gras_socket_t sock) { +int gras_socket_my_port (gras_socket_t sock) { return sock->port; } int gras_socket_peer_port(gras_socket_t sock) { @@ -372,6 +413,13 @@ int gras_socket_peer_port(gras_socket_t sock) { char *gras_socket_peer_name(gras_socket_t sock) { return sock->peer_name; } +char *gras_socket_peer_proc(gras_socket_t sock) { + return sock->peer_proc; +} + +void gras_socket_peer_proc_set(gras_socket_t sock,char*peer_proc) { + sock->peer_proc = peer_proc; +} /** \brief Check if the provided socket is a measurement one (or a regular one) */ int gras_socket_is_meas(gras_socket_t sock) { @@ -396,24 +444,29 @@ void gras_socket_meas_send(gras_socket_t peer, unsigned int timeout, unsigned long int exp_size, unsigned long int msg_size) { - char *chunk = xbt_malloc0(msg_size); + char *chunk=NULL; unsigned long int exp_sofar; XBT_IN; + if (gras_if_RL()) + chunk=xbt_malloc0(msg_size); + 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(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(gras_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)); - gras_trp_chunk_send(peer,chunk,msg_size); + (*peer->plugin->raw_send)(peer,chunk,msg_size); } - CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(gras_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); + if (gras_if_RL()) + free(chunk); XBT_OUT; } @@ -428,24 +481,30 @@ void gras_socket_meas_recv(gras_socket_t peer, unsigned long int exp_size, unsigned long int msg_size){ - char *chunk = xbt_malloc(msg_size); + char *chunk=NULL; unsigned long int exp_sofar; XBT_IN; - xbt_assert0(peer->meas,"Asked to receive measurement data on a regular socket\n"); + if (gras_if_RL()) + chunk = xbt_malloc(msg_size); + + xbt_assert0(peer->meas, + "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(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(gras_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)); - gras_trp_chunk_recv(peer,chunk,msg_size); + (peer->plugin->raw_recv)(peer,chunk,msg_size); } - CDEBUG5(trp_meas,"Recvd %ld of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(gras_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); + if (gras_if_RL()) + free(chunk); XBT_OUT; } @@ -468,13 +527,14 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ "No need to accept on non-measurement sockets (it's automatic)"); if (!peer->accepting) { - /* nothing to accept here */ + /* nothing to accept here (must be in SG) */ + /* BUG: FIXME: this is BAD! it makes tricky to free the accepted socket*/ return peer; } res = (peer->plugin->socket_accept)(peer); res->meas = peer->meas; - CDEBUG1(trp_meas,"meas_accepted onto %d",res->sd); + CDEBUG1(gras_trp_meas,"meas_accepted onto %d",res->sd); return res; } @@ -486,7 +546,10 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ static void *gras_trp_procdata_new() { gras_trp_procdata_t res = xbt_new(s_gras_trp_procdata_t,1); + res->name = xbt_strdup("gras_trp"); + res->name_len = 0; res->sockets = xbt_dynar_new(sizeof(gras_socket_t*), NULL); + res->myport = 0; return (void*)res; } @@ -495,22 +558,38 @@ static void *gras_trp_procdata_new() { * Freeing procdata for this module */ static void gras_trp_procdata_free(void *data) { - gras_trp_procdata_t res = (gras_trp_procdata_t)data; - - xbt_dynar_free(&( res->sockets )); - free(res); + gras_trp_procdata_t res = (gras_trp_procdata_t)data; + + xbt_dynar_free(&( res->sockets )); + free(res->name); + free(res); +} + +void gras_trp_socketset_dump(const char *name) { + gras_trp_procdata_t procdata = + (gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id); + + int it; + gras_socket_t s; + + INFO1("** Dump the socket set %s",name); + xbt_dynar_foreach(procdata->sockets, it, s) { + INFO4(" %p -> %s:%d %s", + s,gras_socket_peer_name(s),gras_socket_peer_port(s), + s->valid?"(valid)":"(peer dead)"); + } + INFO1("** End of socket set %s",name); } /* * Module registration */ +int gras_trp_libdata_id; void gras_trp_register() { - gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free); + gras_trp_libdata_id = gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free); } - -xbt_dynar_t -gras_socketset_get(void) { - /* FIXME: KILLME */ - return ((gras_trp_procdata_t) gras_libdata_get("gras_trp"))->sockets; +int gras_os_myport(void) { + return ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport; } +