X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2539fff313cbd67c45b8490f7961e45e358d9ba2..a8210ef736c5ba76c193eb7150dc7562a54ff7fd:/src/gras/Transport/rl_transport.c diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index bd697f1532..6c538b76d0 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -2,27 +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 /* struct timeval */ -#include -#include + * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "xbt/ex.h" +#include "portable.h" #include "gras/Transport/transport_private.h" -XBT_LOG_EXTERNAL_CATEGORY(transport); -XBT_LOG_DEFAULT_CATEGORY(transport); - - +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp); /** * 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) * @@ -30,59 +23,102 @@ XBT_LOG_DEFAULT_CATEGORY(transport); * * if timeout>0 and no message there, wait at most that amount of time before giving up. */ -xbt_error_t -gras_trp_select(double timeout, - gras_socket_t *dst) { - - xbt_error_t errcode; - xbt_dynar_t sockets= gras_socketset_get(); +gras_socket_t gras_trp_select(double timeout) { + xbt_dynar_t sockets= ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets; 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; */ 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 */ + 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 */ - *dst=NULL; + /* Check whether there is more data to read from the socket we selected last time. + This can happen with tcp buffered sockets since we try to get as much data as we can for them */ + static gras_socket_t _lastly_selected_socket = NULL; + if (_lastly_selected_socket && _lastly_selected_socket->moredata) { + VERB0("Returning _lastly_selected_socket since there is more data on it"); + return _lastly_selected_socket; + } + + /* 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 + while (done == -1) { if (timeout > 0) { /* did we timeout already? */ now = gras_os_time(); + DEBUG2("wakeup=%f now=%f",wakeup, now); if (now == -1 || now >= wakeup) { - done = 0; /* didn't find anything */ - break; + /* didn't find anything; no need to update _lastly_selected_socket since its moredata is 0 (or we would have returned it directly) */ + THROW1(timeout_error,0, + "Timeout (%f) elapsed with selecting for incomming connexions", + timeout); } } /* construct the set of socket to ear from */ FD_ZERO(&FDS); + max_fds = -1; xbt_dynar_foreach(sockets,cursor,sock_iter) { + if (!sock_iter->valid) + continue; + 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); + THROW1(timeout_error,0,"No socket to select onto. Sleep %f sec instead",timeout); + } else { + DEBUG0("No socket to select onto. Return directly."); + THROW0(timeout_error,0, "No socket to select onto. Return directly."); + } + } + +#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 */ - tout.tv_sec = (unsigned long)((wakeup - now)/1000000); - tout.tv_usec = (unsigned long)(wakeup - now) % 1000000; + tout.tv_sec = (unsigned long)(wakeup - now); + tout.tv_usec = ((wakeup -now) - ((unsigned long)(wakeup - now))) * 1000000; p_tout = &tout; } else if (timeout == 0) { /* polling only */ @@ -95,29 +131,30 @@ gras_trp_select(double timeout, /* no timeout: good luck! */ p_tout = NULL; } - - DEBUG1("Selecting over %d socket(s)", max_fds-1); + + DEBUG2("Selecting over %d socket(s); timeout=%f", max_fds-1,timeout); ready = select(max_fds, &FDS, NULL, NULL, p_tout); + DEBUG1("select returned %d", ready); if (ready == -1) { switch (errno) { case EINTR: /* a signal we don't care about occured. we don't care */ /* if we cared, we would have set an handler */ continue; case EINVAL: /* invalid value */ - RAISE3(system_error,"invalid select: nb fds: %d, timeout: %d.%d", + THROW3(system_error,EINVAL,"invalid select: nb fds: %d, timeout: %d.%d", max_fds, (int)tout.tv_sec,(int) tout.tv_usec); case ENOMEM: xbt_assert0(0,"Malloc error during the select"); default: - RAISE2(system_error,"Error during select: %s (%d)", + THROW2(system_error,errno,"Error during select: %s (%d)", strerror(errno),errno); } - RAISE_IMPOSSIBLE; + THROW_IMPOSSIBLE; } else if (ready == 0) { continue; /* this was a timeout */ } - xbt_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; } @@ -128,13 +165,13 @@ 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; + gras_socket_t accepted=NULL; + + accepted = (sock_iter->plugin->socket_accept)(sock_iter); + DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted); + accepted->meas = sock_iter->meas; - TRY(sock_iter->plugin->socket_accept(sock_iter,&accepted)); - accepted->raw = sock_iter->raw; - } else { -#if 0 - FIXME: this fails of files. quite logical + } else if (sock_iter->recv_ok) { /* Make sure the socket is still alive by reading the first byte */ char lookahead; int recvd; @@ -143,21 +180,24 @@ gras_trp_select(double timeout, if (recvd < 0) { WARN2("socket %d failed: %s", sock_iter->sd, strerror(errno)); /* done with this socket */ - gras_socket_close(&sock_iter); + gras_socket_close(sock_iter); cursor--; } else if (recvd == 0) { /* Connection reset (=closed) by peer. */ DEBUG1("Connection %d reset by peer", sock_iter->sd); - gras_socket_close(&sock_iter); - cursor--; + sock_iter->valid=0; /* don't close it. User may keep references to it */ } else { -#endif /* Got a suited socket ! */ - *dst = sock_iter; - return no_error; -#if 0 + XBT_OUT; + _lastly_selected_socket = sock_iter; + return sock_iter; } -#endif + + } else { + /* This is a file socket. Cannot recv() on it, but it must be alive */ + XBT_OUT; + _lastly_selected_socket = sock_iter; + return sock_iter; } @@ -168,9 +208,12 @@ gras_trp_select(double timeout, } - return timeout_error; + /* No socket found. Maybe we had timeout=0 and nothing to do */ + DEBUG0("TIMEOUT"); + THROW0(timeout_error,0,"Timeout"); } -xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) { - return mismatch_error; +void gras_trp_sg_setup(gras_trp_plugin_t plug) { + THROW0(mismatch_error,0,"No SG transport on live platforms"); } +