Module Name: src
Committed By: riastradh
Date: Fri Jun 23 21:09:45 UTC 2023
Modified Files:
src/sys/rump/librump/rumpkern: klock.c
Log Message:
rump: KASSERT(x && y) -> KASSERT(x); KASSERT(y)
Add some KASSERTMSG while here.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/klock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/klock.c
diff -u src/sys/rump/librump/rumpkern/klock.c:1.10 src/sys/rump/librump/rumpkern/klock.c:1.11
--- src/sys/rump/librump/rumpkern/klock.c:1.10 Thu Jul 7 06:55:44 2016
+++ src/sys/rump/librump/rumpkern/klock.c Fri Jun 23 21:09:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $ */
+/* $NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.10 2016/07/07 06:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: klock.c,v 1.11 2023/06/23 21:09:44 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,9 @@ void
rump_kernel_bigwrap(int *nlocks)
{
- KASSERT(giantcnt > 0 && curlwp == giantowner);
+ KASSERTMSG(giantcnt > 0, "giantcnt=%d", giantcnt);
+ KASSERTMSG(curlwp == giantowner, "curlwp=%p giantowner=%p",
+ curlwp, giantowner);
giantowner = NULL;
*nlocks = giantcnt;
giantcnt = 0;
