hurd: Make _hurd_intr_rpc_mach_msg avoid returning MACH_SEND_INTERRUPTED

When the given options do not include MACH_SEND_INTERRUPT,
_hurd_intr_rpc_mach_msg (aka mach_msg) is not supposed to return
MACH_SEND_INTERRUPTED.  In such a case we thus have to retry sending the
message.

This was observed to fix various occurrences of spurious
"(ipc/send) interrupted" errors when running haskell programs.

diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c
index bc1f43d..98f588f 100644 (file)
--- a/hurd/intr-msg.c
+++ b/hurd/intr-msg.c
@@ -143,6 +143,12 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg,
             XXX */
          goto retry_receive;
        }
+      if (!(option & MACH_SEND_INTERRUPT))
+       {
+         option = user_option;
+         timeout = user_timeout;
+         goto message;
+       }
       /* FALLTHROUGH */
 
       /* These are the other codes that mean a pseudo-receive modified