X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2539fff313cbd67c45b8490f7961e45e358d9ba2..548c6b2142ac766395e10567352c3887a1b897a0:/src/gras/Transport/rl_transport.c?ds=sidebyside

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index bd697f1532..e9eba7e285 100644
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -2,23 +2,16 @@
 
 /* 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/time.h> /* struct timeval */
-#include <sys/types.h>
-#include <sys/socket.h>
+ * 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:
  *
@@ -44,12 +37,27 @@ gras_trp_select(double timeout,
   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 */
 
+   
+  /* 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? */
@@ -62,22 +70,42 @@ gras_trp_select(double 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;
+#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) {
+	  DEBUG0("No socket to select onto. Sleep instead.");
+	  gras_os_sleep(timeout,0);
+	  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 */
@@ -95,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) {
@@ -128,9 +156,10 @@ 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));
+	 gras_socket_t accepted=NULL;
+	 
+	 DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
+	 TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted));
 	 accepted->raw = sock_iter->raw;
        } else {
 #if 0 
@@ -154,6 +183,7 @@ gras_trp_select(double timeout,
 #endif
 	   /* Got a suited socket ! */
 	   *dst = sock_iter;
+	   XBT_OUT;
 	   return no_error;
 #if 0
 	 }
@@ -168,9 +198,11 @@ gras_trp_select(double timeout,
 
   }
 
+  XBT_OUT;
   return timeout_error;
 }
 
 xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) {
   return mismatch_error;
 }
+