/* 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 <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "Transport/transport_private.h"
-GRAS_LOG_EXTERNAL_CATEGORY(transport);
-GRAS_LOG_DEFAULT_CATEGORY(transport);
-
-
-gras_error_t
-gras_socket_server(unsigned short port,
- unsigned int bufSize,
- /* OUT */ gras_socket_t **dst) {
-
- gras_error_t errcode;
- gras_trp_plugin_t *tcp;
-
- TRY(gras_trp_plugin_get_by_name("TCP",&tcp));
- TRY( tcp->socket_server(tcp, port, bufSize, dst));
-
- (*dst)->incoming = 1;
- (*dst)->accepting = 1;
-
- TRY(gras_dynar_push(_gras_trp_sockets,dst));
-
- return no_error;
-}
-
-gras_error_t
-gras_socket_client(const char *host,
- unsigned short port,
- unsigned int bufSize,
- /* OUT */ gras_socket_t **dst) {
-
- gras_error_t errcode;
- gras_trp_plugin_t *tcp;
-
- TRY(gras_trp_plugin_get_by_name("TCP",&tcp));
- TRY( (*tcp->socket_client)(tcp, host, port, bufSize, dst));
-
- (*dst)->incoming = 0;
- (*dst)->accepting = 0;
-
- return no_error;
-}
+ * 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)
*
*
* 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;
+ xbt_error_t errcode;
+ xbt_dynar_t sockets= gras_socketset_get();
int done = -1;
- double wakeup = gras_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) {
if (timeout > 0) { /* did we timeout already? */
- now = gras_time();
+ now = gras_os_time();
if (now == -1 || now >= wakeup) {
done = 0; /* didn't find anything */
break;
/* construct the set of socket to ear from */
FD_ZERO(&FDS);
- gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
- if (max_fds < sock_iter->sd)
- max_fds = sock_iter->sd;
- FD_SET(sock_iter->sd, &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;
+#endif
+ FD_SET(sock_iter->sd, &FDS);
+ } else {
+ DEBUG1("Not considering socket %d for select",sock_iter->sd);
+ }
+ }
+
+ 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;
+ }
}
- /* we cannot have more than FD_SETSIZE sockets */
- if (++max_fds > FD_SETSIZE) {
- WARNING0("too many open sockets.");
+#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 */
/* 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) {
switch (errno) {
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);
continue; /* this was a timeout */
}
- gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
+ xbt_dynar_foreach(sockets,cursor,sock_iter) {
if(!FD_ISSET(sock_iter->sd, &FDS)) { /* this socket is not ready */
continue;
}
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));
- TRY(gras_dynar_push(_gras_trp_sockets,&accepted));
+ 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
/* Make sure the socket is still alive by reading the first byte */
char lookahead;
int recvd;
recvd = recv(sock_iter->sd, &lookahead, 1, MSG_PEEK);
if (recvd < 0) {
- WARNING2("socket %d failed: %s", sock_iter->sd, strerror(errno));
+ 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
}
+#endif
}
}
+ XBT_OUT;
return timeout_error;
}
+
+xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) {
+ return mismatch_error;
+}
+
