X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd950e3c32576276db6406a6af962e5ef72b7327..acbc8f35e5a8520356ce5a527971e6685a4e5793:/src/gras/Transport/rl_transport.c diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index 68d01bb6c4..5b6b6ecdda 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -7,15 +7,15 @@ /* 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 "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) * @@ -23,14 +23,10 @@ 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; */ @@ -58,20 +54,24 @@ gras_trp_select(double timeout, # endif /* !USE_SYSCONF */ #endif - *dst=NULL; 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 */ + 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->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; @@ -82,6 +82,17 @@ gras_trp_select(double timeout, } } + 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) */ @@ -96,8 +107,8 @@ gras_trp_select(double timeout, 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 */ @@ -110,24 +121,25 @@ 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 */ } @@ -145,12 +157,11 @@ gras_trp_select(double timeout, /* not a socket but an ear. accept on it and serve next socket */ gras_socket_t accepted=NULL; + accepted = (sock_iter->plugin->socket_accept)(sock_iter); DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted); - TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted)); - accepted->raw = sock_iter->raw; - } else { -#if 0 - FIXME: this fails of files. quite logical + accepted->meas = sock_iter->meas; + + } else if (sock_iter->recv_ok) { /* Make sure the socket is still alive by reading the first byte */ char lookahead; int recvd; @@ -159,22 +170,23 @@ 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); + gras_socket_close(sock_iter); cursor--; } else { -#endif /* Got a suited socket ! */ - *dst = sock_iter; XBT_OUT; - return no_error; -#if 0 + return sock_iter; } -#endif + + } else { + /* This is a file socket. Cannot recv() on it, but it must be alive */ + XBT_OUT; + return sock_iter; } @@ -186,10 +198,10 @@ gras_trp_select(double timeout, } XBT_OUT; - return timeout_error; + return NULL; } -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"); }