/* 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:
*
* 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() + timeout;
double now = 0;
gras_socket_t sock_iter; /* iterating over all sockets */
int cursor; /* iterating over all sockets */
-
+ /* 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 );
# 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; 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);
}
}
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 (timeout > 0) {
DEBUG1("No socket to select onto. Sleep %f sec instead.",timeout);
gras_os_sleep(timeout);
- return timeout_error;
+ THROW1(timeout_error,0,"No socket to select onto. Sleep %f sec instead",timeout);
} else {
DEBUG0("No socket to select onto. Return directly.");
- return timeout_error;
+ THROW0(timeout_error,0, "No socket to select onto. Return directly.");
}
}
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 */
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;
}
/* 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;
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;
XBT_OUT;
- return no_error;
-#if 0
+ _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;
}
}
- XBT_OUT;
- 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");
}
