If the timeout is negative, the user wants to block

[simgrid.git] / src / gras / Transport / sg_transport.c

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 7299205..b77eae4 100644 (file)
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -33,29 +33,26 @@ gras_socket_t gras_trp_select(double timeout) {
     (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
   gras_trp_sg_sock_data_t *sockdata;
   gras_trp_plugin_t trp;
-  gras_socket_t active_socket;
+  gras_socket_t active_socket = NULL;
   gras_trp_sg_sock_data_t *active_socket_data;
   gras_socket_t sock_iter; /* iterating over all sockets */
   int cursor;
 
-  DEBUG0("Trying to get the lock pd, trp_select");
-  SIMIX_mutex_lock(pd->msg_select_mutex);
   DEBUG3("select on %s@%s with timeout=%f",
         SIMIX_process_get_name(SIMIX_process_self()),
         SIMIX_host_get_name(SIMIX_host_self()),
         timeout);
-
-  if (xbt_fifo_size(pd->msg_selectable_sockets) == 0) {
-    /* message didn't arrive yet, wait */
-    SIMIX_cond_wait_timeout(pd->msg_select_cond,pd->msg_select_mutex,timeout);
-  }
-
-  if (xbt_fifo_size(pd->msg_selectable_sockets) == 0) {
+   if (timeout>=0) {
+      xbt_queue_shift_timed(pd->msg_selectable_sockets,
+                           &active_socket, timeout);
+   } else {
+      xbt_queue_shift(pd->msg_selectable_sockets, &active_socket);
+   }
+   
+  if (active_socket == NULL) {
     DEBUG0("TIMEOUT");
-    SIMIX_mutex_unlock(pd->msg_select_mutex);
     THROW0(timeout_error,0,"Timeout");
   }
-  active_socket = xbt_fifo_shift(pd->msg_selectable_sockets);
   active_socket_data = (gras_trp_sg_sock_data_t*)active_socket->data;
   
   /* Ok, got something. Open a socket back to the expeditor */
@@ -72,7 +69,7 @@ gras_socket_t gras_trp_select(double timeout) {
 
     if ( (sock_data->to_socket == active_socket) && 
         (sock_data->to_host == SIMIX_process_get_host(active_socket_data->from_process)) ) {
-      SIMIX_mutex_unlock(pd->msg_select_mutex);
+                       xbt_dynar_cursor_unlock(pd->sockets);   
       return sock_iter;
     }
   }
@@ -121,7 +118,6 @@ gras_socket_t gras_trp_select(double timeout) {
         res->peer_port,
         SIMIX_process_get_name(sockdata->to_process), res->port);
 
-  SIMIX_mutex_unlock(pd->msg_select_mutex);
   return res;
 }