Module Name: src
Committed By: gson
Date: Sat Jul 19 14:14:21 UTC 2014
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
Do not assert that the two threads do not simultanously notify each
other, because sometimes they do. Should fix PR kern/46464. OK pooka.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/lib/librumphijack/hijack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.107 src/lib/librumphijack/hijack.c:1.108
--- src/lib/librumphijack/hijack.c:1.107 Wed Apr 2 17:09:23 2014
+++ src/lib/librumphijack/hijack.c Sat Jul 19 14:14:21 2014
@@ -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 @@ REALPOLLTS(struct pollfd *fds, nfds_t nf
/* 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--;
}
