diff options
author | delphij <delphij@FreeBSD.org> | 2015-09-12 08:50:43 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-09-12 08:50:43 +0000 |
commit | 0150a7214e9e1da3e7b8e2c27ba2ea563590975d (patch) | |
tree | 7ac6d2cde1ab96032191b56fba7de607ae08d944 /sys/cddl | |
parent | d9e5e9837ea21fc07fcbd873b79462e244cda123 (diff) | |
download | FreeBSD-src-0150a7214e9e1da3e7b8e2c27ba2ea563590975d.zip FreeBSD-src-0150a7214e9e1da3e7b8e2c27ba2ea563590975d.tar.gz |
MFV r287684: 6091 avl_add doesn't assert on non-debug builds
Use assfail() from libuutil instead of ASSERT() in userland
AVL avl_add.
illumos/illumos-gate@faa2b6be2fc102adf9ed584fc1a667b4ddf50d78
Illumos issues:
6091 avl_add doesn't assert on non-debug builds
https://www.illumos.org/issues/6091
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/common/avl/avl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/avl/avl.c b/sys/cddl/contrib/opensolaris/common/avl/avl.c index 9d86242..2349aba 100644 --- a/sys/cddl/contrib/opensolaris/common/avl/avl.c +++ b/sys/cddl/contrib/opensolaris/common/avl/avl.c @@ -25,6 +25,7 @@ /* * Copyright (c) 2014 by Delphix. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ /* @@ -635,14 +636,17 @@ avl_add(avl_tree_t *tree, void *new_node) /* * This is unfortunate. We want to call panic() here, even for * non-DEBUG kernels. In userland, however, we can't depend on anything - * in libc or else the rtld build process gets confused. So, all we can - * do in userland is resort to a normal ASSERT(). + * in libc or else the rtld build process gets confused. + * Thankfully, rtld provides us with its own assfail() so we can use + * that here. We use assfail() directly to get a nice error message + * in the core - much like what panic() does for crashdumps. */ if (avl_find(tree, new_node, &where) != NULL) #ifdef _KERNEL panic("avl_find() succeeded inside avl_add()"); #else - ASSERT(0); + (void) assfail("avl_find() succeeded inside avl_add()", + __FILE__, __LINE__); #endif avl_insert(tree, new_node, where); } |