Author: delphij
Date: Sat Sep 12 08:50:43 2015
New Revision: 287703
URL: https://svnweb.freebsd.org/changeset/base/287703
Log:
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
Modified:
head/sys/cddl/contrib/opensolaris/common/avl/avl.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/common/avl/avl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/common/avl/avl.c Sat Sep 12 08:35:51
2015 (r287702)
+++ head/sys/cddl/contrib/opensolaris/common/avl/avl.c Sat Sep 12 08:50:43
2015 (r287703)
@@ -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);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
