Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumphijack Do not assert that the two threads do not ...



details:   https://anonhg.NetBSD.org/src/rev/2e1d39550919
branches:  trunk
changeset: 330716:2e1d39550919
user:      gson <gson%NetBSD.org@localhost>
date:      Sat Jul 19 14:14:21 2014 +0000

description:
Do not assert that the two threads do not simultanously notify each
other, because sometimes they do.  Should fix PR kern/46464.  OK pooka.

diffstat:

 lib/librumphijack/hijack.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r a953315b53bb -r 2e1d39550919 lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Sat Jul 19 08:38:28 2014 +0000
+++ b/lib/librumphijack/hijack.c        Sat Jul 19 14:14:21 2014 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.107 2014/04/02 17:09:23 justin Exp $     */
+/*      $NetBSD: hijack.c,v 1.108 2014/07/19 14:14:21 gson Exp $       */
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include <rump/rumpuser_port.h>
 
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.107 2014/04/02 17:09:23 justin Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.108 2014/07/19 14:14:21 gson Exp $");
 #endif
 
 #include <sys/param.h>
@@ -2070,12 +2070,10 @@
 
                /* strip cross-thread notification from real results */
                if (pfd_host[nfds].revents & POLLIN) {
-                       assert((pfd_rump[nfds].revents & POLLIN) == 0);
                        assert(rv_host > 0);
                        rv_host--;
                }
                if (pfd_rump[nfds].revents & POLLIN) {
-                       assert((pfd_host[nfds].revents & POLLIN) == 0);
                        assert(rv_rump > 0);
                        rv_rump--;
                }



Home | Main Index | Thread Index | Old Index