From: mquinson Date: Sat, 14 Jul 2007 10:13:52 +0000 (+0000) Subject: If the timeout is negative, the user wants to block X-Git-Tag: v3.3~1574 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5753373bd1394e1b8d85f0e1ee9f963de662dd76?hp=a807aa1bf344d03be30b4b87761f71acd41b910b If the timeout is negative, the user wants to block git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3786 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 3fb38303e8..b77eae404d 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -42,9 +42,13 @@ gras_socket_t gras_trp_select(double timeout) { SIMIX_process_get_name(SIMIX_process_self()), SIMIX_host_get_name(SIMIX_host_self()), timeout); - - xbt_queue_shift_timed(pd->msg_selectable_sockets, - &active_socket, timeout); + 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"); THROW0(timeout_error,0,"Timeout");