add separate lock class function for recursed mutexes

freebsd · Apr 27, 2010 · 10290bd · 10290bd
1 parent d307d85
commit 10290bd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
@@ -97,6 +97,7 @@ static void	lock_spin(struct lock_object *lock, int how);
 static int	owner_mtx(struct lock_object *lock, struct thread **owner);
 #endif
 static int	unlock_mtx(struct lock_object *lock);
+static int	unlock_recursable_mtx(struct lock_object *lock);
 static int	unlock_spin(struct lock_object *lock);
 
 /*
@@ -111,6 +112,7 @@ struct lock_class lock_class_mtx_sleep = {
 #endif
 	.lc_lock = lock_mtx,
 	.lc_unlock = unlock_mtx,
+	.lc_unlock_recursable = unlock_recursable_mtx,
 #ifdef KDTRACE_HOOKS
 	.lc_owner = owner_mtx,
 #endif
@@ -184,6 +186,17 @@ unlock_mtx(struct lock_object *lock)
 {
 	struct mtx *m;
 
+	m = (struct mtx *)lock;
+	mtx_assert(m, MA_NOTRECURSED|MA_OWNED);
+	mtx_unlock(m);
+	return (0);
+}
+
+int
+unlock_recursable_mtx(struct lock_object *lock)
+{
+	struct mtx *m;
+
 	m = (struct mtx *)lock;
 	mtx_assert(m, MA_OWNED);
 	mtx_unlock(m);

diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c
@@ -714,7 +714,7 @@ ls_pop(struct lock_stack *ls)
 	ls->ls_top--;
 	lock = ls->ls_array[ls->ls_top].lse_lock;
 	class = ls->ls_array[ls->ls_top].lse_class;	
-	class->lc_unlock(lock);
+	class->lc_unlock_recursable(lock);
 }
 
 void
@@ -729,7 +729,7 @@ ls_popa(struct lock_stack *ls)
 		ls->ls_top--;
 		lock = ls->ls_array[ls->ls_top].lse_lock;
 		class = ls->ls_array[ls->ls_top].lse_class;
-		class->lc_unlock(lock);
+		class->lc_unlock_recursable(lock);
 	}
 }
 
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
@@ -65,6 +65,7 @@ struct lock_class {
 	int	(*lc_unlock)(struct lock_object *lock);
 	void	(*lc_lock_full)(struct lock_object *lock, char *file, int line);
 	int	(*lc_trylock)(struct lock_object *lock);
+	int	(*lc_unlock_recursable)(struct lock_object *lock);	
 };
 
 #define	LC_SLEEPLOCK	0x00000001	/* Sleep lock. */