X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02305db551e2a0804a3fd7b24622be6b12285572..214d4593f9a407095fa0c07b0e8299bfeeb1c40b:/src/gras/Transport/rl_transport.c

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index 244960158c..f32e5981e2 100644
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -7,6 +7,7 @@
 /* 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);
@@ -23,12 +24,8 @@ 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() + timeout;
   double now = 0;
@@ -58,10 +55,10 @@ 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;
@@ -88,10 +85,10 @@ gras_trp_select(double timeout,
        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.");
        }
     }
 
@@ -109,8 +106,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 */
@@ -124,23 +121,24 @@ gras_trp_select(double timeout,
       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 */
     }
@@ -158,7 +156,7 @@ gras_trp_select(double timeout,
 	 /* not a socket but an ear. accept on it and serve next socket */
 	 gras_socket_t accepted=NULL;
 	 
-	 TRYOLD((sock_iter->plugin->socket_accept)(sock_iter,&accepted));
+	 accepted = (sock_iter->plugin->socket_accept)(sock_iter);
 	 DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted);
 	 accepted->meas = sock_iter->meas;
        } else {
@@ -182,9 +180,8 @@ gras_trp_select(double timeout,
 	 } else { 
 #endif
 	   /* Got a suited socket ! */
-	   *dst = sock_iter;
 	   XBT_OUT;
-	   return no_error;
+	   return sock_iter;
 #if 0
 	 }
 #endif
@@ -199,10 +196,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");
 }