From: Richard Braun <rbraun@sceen.net>
Date: Thu, 29 Aug 2019 22:58:14 +0000 (+0200)
Subject: hurd: Fix _hurd_select for single fd sets
X-Git-Tag: changelog-ends-here~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b068090a0062500e4a254a98f5cd8a7d2c3c435;p=thirdparty%2Fglibc.git

hurd: Fix _hurd_select for single fd sets

The function attempts to optimize this case by performing one IPC system
call with the timeout included among the parameters, but in the absence
of a reply, it will call mach_msg again with the same timeout later,
effectively doubling the total timeout of the select/poll call.

Remove this optimization for the time being.

	* hurd/hurdselect.c (_hurd_select): Always call __io_select with no
	timeout.
---

diff --git a/ChangeLog b/ChangeLog
index 87d43d425e9..06c8852c958 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-30  Richard Braun <rbraun@sceen.net>
+
+	* hurd/hurdselect.c (_hurd_select): Always call __io_select with no
+	timeout.
+
 2019-08-29  Mihailo Stojanovic  <mihailo.stojanovic@rt-rk.com>
 
 	* elf/dl-addr.c (determine_info): Calculate the symbol index
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
index 6997b2b73b9..a5e6e26b9a4 100644
--- a/hurd/hurdselect.c
+++ b/hurd/hurdselect.c
@@ -236,10 +236,7 @@ _hurd_select (int nfds,
 	  {
 	    int type = d[i].type;
 	    d[i].reply_port = __mach_reply_port ();
-	    err = __io_select (d[i].io_port, d[i].reply_port,
-			       /* Poll only if there's a single descriptor.  */
-			       (firstfd == lastfd) ? to : 0,
-			       &type);
+	    err = __io_select (d[i].io_port, d[i].reply_port, 0, &type);
 	    switch (err)
 	      {
 	      case MACH_RCV_TIMED_OUT: