Mercurial > libjeffpc

changeset 761:9aa886a2355b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
synch: use generic magic/type checking on condition variables Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Thu, 25 Jul 2019 12:45:17 -0400
parents 7b877f2b343d
children ea9254b258c6
files synch.c
diffstat 1 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/synch.c	Thu Jul 25 12:43:34 2019 -0400
+++ b/synch.c	Thu Jul 25 12:45:17 2019 -0400
@@ -467,17 +467,6 @@
 		__bad_type(info, op, where, expected_type);
 }
 
-static void check_cond_magic(struct cond *cond, const char *op,
-			     const struct lock_context *where)
-{
-	if (cond->info.magic == (uintptr_t) &cond->info)
-		return;
-
-	cmn_err(CE_CRIT, "lockdep: thread trying to %s cond with bad magic", op);
-	print_cond(cond, where);
-	panic("lockdep: Aborting - bad cond magic");
-}
-
 static void verify_lock_init(const struct lock_context *where, struct lock *l,
 			     struct lock_class *lc)
 {
@@ -636,7 +625,7 @@
 	if (!c)
 		print_invalid_call("CONDDESTROY", where);
 
-	check_cond_magic(c, "destroy", where);
+	check_magic(&c->info, "destroy", where, SYNCH_TYPE_COND);
 
 	c->info.magic = DESTROYED_MAGIC;
 	/* keep the synch type set to aid debugging */
@@ -649,7 +638,7 @@
 		print_invalid_call(timed ? "CONDTIMEDWAIT" : "CONDWAIT",
 				   where);
 
-	check_cond_magic(c, "wait on", where);
+	check_magic(&c->info, "wait on", where, SYNCH_TYPE_COND);
 
 #ifdef JEFFPC_LOCK_TRACKING
 	/*
@@ -717,7 +706,8 @@
 	if (!c)
 		print_invalid_call(all ? "CONDBCAST" : "CONDSIG", where);
 
-	check_cond_magic(c, all ? "broadcast" : "signal", where);
+	check_magic(&c->info, all ? "broadcast" : "signal", where,
+		    SYNCH_TYPE_COND);
 }
 
 /*