From owner-svn-src-all@freebsd.org Fri Sep 11 20:43:15 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C5B1A01936; Fri, 11 Sep 2015 20:43:15 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43B581F73; Fri, 11 Sep 2015 20:43:15 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8BKhF2Q037073; Fri, 11 Sep 2015 20:43:15 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8BKhF9o037072; Fri, 11 Sep 2015 20:43:15 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201509112043.t8BKhF9o037072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 11 Sep 2015 20:43:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r287684 - vendor-sys/illumos/dist/common/avl X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2015 20:43:15 -0000 Author: avg Date: Fri Sep 11 20:43:14 2015 New Revision: 287684 URL: https://svnweb.freebsd.org/changeset/base/287684 Log: 6091 avl_add doesn't assert on non-debug builds illumos/illumos-gate@faa2b6be2fc102adf9ed584fc1a667b4ddf50d78 https://www.illumos.org/issues/6091 Long story short, avl_add's use of ASSERT(0) can cause really strange looking crashes on non-debug builds of libavl.so because ASSERTs turn into no-ops. ... Reviewed by: Andy Stormont Reviewed by: Matthew Ahrens Reviewed by: Steve Dougherty Approved by: Dan McDonald Author: Josef 'Jeff' Sipek Modified: vendor-sys/illumos/dist/common/avl/avl.c Modified: vendor-sys/illumos/dist/common/avl/avl.c ============================================================================== --- vendor-sys/illumos/dist/common/avl/avl.c Fri Sep 11 20:39:41 2015 (r287683) +++ vendor-sys/illumos/dist/common/avl/avl.c Fri Sep 11 20:43:14 2015 (r287684) @@ -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); }