X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f7f3561941c2be9d43711afb3036dc47df26651..0d9f237d83d3ccdbd0a5a0fb2e82d8d633e98fa3:/src/gras/Transport/rl_transport.c diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index 1dfa236d50..962431602f 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -2,26 +2,20 @@ /* rl_transport - RL specific functions for transport */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ /* 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. */ - -#include -#include -#include - -#include "Transport/transport_private.h" -GRAS_LOG_EXTERNAL_CATEGORY(transport); -GRAS_LOG_DEFAULT_CATEGORY(transport); - + * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "portable.h" +#include "gras/Transport/transport_private.h" +XBT_LOG_EXTERNAL_CATEGORY(transport); +XBT_LOG_DEFAULT_CATEGORY(transport); /** * gras_trp_select: * - * Returns the next socket to service having a message awaiting. + * Returns the next socket to service because it receives a message. * * if timeout<0, we ought to implement the adaptative timeout (FIXME) * @@ -29,25 +23,40 @@ GRAS_LOG_DEFAULT_CATEGORY(transport); * * if timeout>0 and no message there, wait at most that amount of time before giving up. */ -gras_error_t +xbt_error_t gras_trp_select(double timeout, - gras_socket_t **dst) { + gras_socket_t *dst) { - gras_error_t errcode; - gras_dynar_t *sockets= gras_socketset_get(); + xbt_error_t errcode; + xbt_dynar_t sockets= gras_socketset_get(); int done = -1; - double wakeup = gras_os_time() + 1000000*timeout; + double wakeup = gras_os_time() + timeout; double now = 0; /* nextToService used to make sure socket with high number do not starve */ - // static int nextToService = 0; + /* static int nextToService = 0; */ struct timeval tout, *p_tout; int max_fds=0; /* first arg of select: number of existing sockets */ + /* but accept() of winsock returns sockets bigger than the limit, so don't bother + with this tiny optimisation on BillWare */ fd_set FDS; int ready; /* return of select: number of socket ready to be serviced */ - - gras_socket_t *sock_iter; /* iterating over all sockets */ - int cursor; /* iterating over all sockets */ + int fd_setsize; /* FD_SETSIZE not always defined. Get this portably */ + + gras_socket_t sock_iter; /* iterating over all sockets */ + int cursor; /* iterating over all sockets */ + + + /* Compute FD_SETSIZE */ +#ifdef HAVE_SYSCONF + fd_setsize = sysconf( _SC_OPEN_MAX ); +#else +# ifdef HAVE_GETDTABLESIZE + fd_setsize = getdtablesize(); +# else + fd_setsize = FD_SETSIZE; +# endif /* !USE_SYSCONF */ +#endif *dst=NULL; while (done == -1) { @@ -61,22 +70,42 @@ gras_trp_select(double timeout, /* construct the set of socket to ear from */ FD_ZERO(&FDS); - gras_dynar_foreach(sockets,cursor,sock_iter) { + max_fds = -1; + xbt_dynar_foreach(sockets,cursor,sock_iter) { if (sock_iter->incoming) { + DEBUG1("Considering socket %d for select",sock_iter->sd); +#ifndef HAVE_WINSOCK_H if (max_fds < sock_iter->sd) max_fds = sock_iter->sd; +#endif FD_SET(sock_iter->sd, &FDS); } else { DEBUG1("Not considering socket %d for select",sock_iter->sd); } } - /* we cannot have more than FD_SETSIZE sockets */ - if (++max_fds > FD_SETSIZE) { - WARN0("too many open sockets."); + if (max_fds == -1) { + if (timeout > 0) { + DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout); + gras_os_sleep(timeout); + return timeout_error; + } else { + DEBUG0("No socket to select onto. Return directly."); + return timeout_error; + } + } + +#ifndef HAVE_WINSOCK_H + /* we cannot have more than FD_SETSIZE sockets + ... but with WINSOCK which returns sockets higher than the limit (killing this optim) */ + if (++max_fds > fd_setsize && fd_setsize > 0) { + WARN1("too many open sockets (%d).",max_fds); done = 0; break; } +#else + max_fds = fd_setsize; +#endif if (timeout > 0) { /* set the timeout */ @@ -94,7 +123,7 @@ gras_trp_select(double timeout, /* no timeout: good luck! */ p_tout = NULL; } - + DEBUG1("Selecting over %d socket(s)", max_fds-1); ready = select(max_fds, &FDS, NULL, NULL, p_tout); if (ready == -1) { @@ -106,7 +135,7 @@ gras_trp_select(double timeout, RAISE3(system_error,"invalid select: nb fds: %d, timeout: %d.%d", max_fds, (int)tout.tv_sec,(int) tout.tv_usec); case ENOMEM: - RAISE_MALLOC; + xbt_assert0(0,"Malloc error during the select"); default: RAISE2(system_error,"Error during select: %s (%d)", strerror(errno),errno); @@ -116,7 +145,7 @@ gras_trp_select(double timeout, continue; /* this was a timeout */ } - gras_dynar_foreach(sockets,cursor,sock_iter) { + xbt_dynar_foreach(sockets,cursor,sock_iter) { if(!FD_ISSET(sock_iter->sd, &FDS)) { /* this socket is not ready */ continue; } @@ -127,10 +156,11 @@ gras_trp_select(double timeout, if ( sock_iter->accepting && sock_iter->plugin->socket_accept) { /* not a socket but an ear. accept on it and serve next socket */ - gras_socket_t *accepted; - - TRY(sock_iter->plugin->socket_accept(sock_iter,&accepted)); - accepted->raw = sock_iter->raw; + gras_socket_t accepted=NULL; + + TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted)); + DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted); + accepted->meas = sock_iter->meas; } else { #if 0 FIXME: this fails of files. quite logical @@ -153,6 +183,7 @@ gras_trp_select(double timeout, #endif /* Got a suited socket ! */ *dst = sock_iter; + XBT_OUT; return no_error; #if 0 } @@ -167,9 +198,11 @@ gras_trp_select(double timeout, } + XBT_OUT; return timeout_error; } -gras_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) { +xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) { return mismatch_error; } +