Module Name: src
Committed By: ozaki-r
Date: Fri Aug 31 01:23:57 UTC 2018
Modified Files:
src/sys/kern: kern_mutex.c kern_rwlock.c
Log Message:
Sprinkle __predict_false to dedicated assertions of mutex and rwlock
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/kern/kern_mutex.c
cvs rdiff -u -r1.51 -r1.52 src/sys/kern/kern_rwlock.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/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.74 src/sys/kern/kern_mutex.c:1.75
--- src/sys/kern/kern_mutex.c:1.74 Tue Aug 14 01:09:53 2018
+++ src/sys/kern/kern_mutex.c Fri Aug 31 01:23:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.74 2018/08/14 01:09:53 ozaki-r Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.75 2018/08/31 01:23:57 ozaki-r Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.74 2018/08/14 01:09:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.75 2018/08/31 01:23:57 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_mutex.c
#define MUTEX_DASSERT(mtx, cond) \
do { \
- if (!(cond)) \
+ if (__predict_false(!(cond))) \
MUTEX_ABORT(mtx, "assertion failed: " #cond); \
} while (/* CONSTCOND */ 0);
@@ -110,7 +110,7 @@ do { \
#define MUTEX_ASSERT(mtx, cond) \
do { \
- if (!(cond)) \
+ if (__predict_false(!(cond))) \
MUTEX_ABORT(mtx, "assertion failed: " #cond); \
} while (/* CONSTCOND */ 0)
Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.51 src/sys/kern/kern_rwlock.c:1.52
--- src/sys/kern/kern_rwlock.c:1.51 Tue Aug 14 01:09:53 2018
+++ src/sys/kern/kern_rwlock.c Fri Aug 31 01:23:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.51 2018/08/14 01:09:53 ozaki-r Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.52 2018/08/31 01:23:57 ozaki-r Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.51 2018/08/14 01:09:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.52 2018/08/31 01:23:57 ozaki-r Exp $");
#define __RWLOCK_PRIVATE
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_rwlock.
(uintptr_t)__builtin_return_address(0), op == RW_READER);
#define RW_DASSERT(rw, cond) \
do { \
- if (!(cond)) \
+ if (__predict_false(!(cond))) \
rw_abort(__func__, __LINE__, rw, "assertion failed: " #cond);\
} while (/* CONSTCOND */ 0);
@@ -94,7 +94,7 @@ do { \
#define RW_ASSERT(rw, cond) \
do { \
- if (!(cond)) \
+ if (__predict_false(!(cond))) \
rw_abort(__func__, __LINE__, rw, "assertion failed: " #cond);\
} while (/* CONSTCOND */ 0)
