X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6521142974bf561e632684f99fd1708726e474a0..5c145db0b251fcbd6c859b25262651aaa5230fa9:/src/gras/Transport/transport.c diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index fa2bda95fb..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 */ @@ -149,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; @@ -157,11 +158,14 @@ 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; @@ -169,11 +173,10 @@ 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; } - - + /** * @brief Opens a server socket and makes it ready to be listened to. * @param port: port on which you want to listen @@ -213,12 +216,52 @@ 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; portname,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_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) { @@ -312,7 +360,8 @@ 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; } @@ -364,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) { @@ -400,12 +456,12 @@ void gras_socket_meas_send(gras_socket_t peer, 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)); (*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)); @@ -438,12 +494,12 @@ void gras_socket_meas_recv(gras_socket_t peer, 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)); (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)); @@ -472,13 +528,13 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ if (!peer->accepting) { /* nothing to accept here (must be in SG) */ - /* FIXME: this is BAD! since it makes tricky to free the accepted socket*/ + /* 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; } @@ -493,6 +549,7 @@ static void *gras_trp_procdata_new() { 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; } @@ -501,11 +558,27 @@ 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->name); - 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); } /* @@ -516,3 +589,7 @@ void gras_trp_register() { gras_trp_libdata_id = gras_procdata_add("gras_trp",gras_trp_procdata_new, gras_trp_procdata_free); } +int gras_os_myport(void) { + return ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport; +} +