From owner-svn-src-stable-8@FreeBSD.ORG Fri Aug 23 14:18:29 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9CC6F891; Fri, 23 Aug 2013 14:18:29 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6DACE2AB8; Fri, 23 Aug 2013 14:18:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NEITdt083456; Fri, 23 Aug 2013 14:18:29 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NEIOTY083401; Fri, 23 Aug 2013 14:18:24 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201308231418.r7NEIOTY083401@svn.freebsd.org> From: Andriy Gapon Date: Fri, 23 Aug 2013 14:18:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r254705 - in stable/8/sys: cddl/compat/opensolaris/sys cddl/dev/dtrace conf modules/cyclic modules/dtrace/dtmalloc modules/dtrace/dtnfsclient modules/dtrace/dtrace modules/dtrace/dtrace... X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Aug 2013 14:18:29 -0000 Author: avg Date: Fri Aug 23 14:18:24 2013 New Revision: 254705 URL: http://svnweb.freebsd.org/changeset/base/254705 Log: MFC r253996,253997: opensolaris code: translate INVARIANTS to DEBUG and ZFS_DEBUG Please note that support for compiling ZFS into a kernel is not in this branch as of now. Also, not all modules from head are in this branch. Added: stable/8/sys/cddl/compat/opensolaris/sys/debug_compat.h - copied unchanged from r253996, head/sys/cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/cddl/compat/opensolaris/sys/mutex.h stable/8/sys/cddl/compat/opensolaris/sys/rwlock.h stable/8/sys/cddl/dev/dtrace/dtrace_load.c stable/8/sys/cddl/dev/dtrace/dtrace_unload.c stable/8/sys/conf/options stable/8/sys/modules/cyclic/Makefile stable/8/sys/modules/dtrace/dtmalloc/Makefile stable/8/sys/modules/dtrace/dtnfsclient/Makefile stable/8/sys/modules/dtrace/dtrace/Makefile stable/8/sys/modules/dtrace/dtrace_test/Makefile stable/8/sys/modules/dtrace/dtraceall/Makefile stable/8/sys/modules/dtrace/fasttrap/Makefile stable/8/sys/modules/dtrace/fbt/Makefile stable/8/sys/modules/dtrace/lockstat/Makefile stable/8/sys/modules/dtrace/profile/Makefile stable/8/sys/modules/dtrace/prototype/Makefile stable/8/sys/modules/dtrace/sdt/Makefile stable/8/sys/modules/dtrace/systrace/Makefile stable/8/sys/modules/dtrace/systrace_freebsd32/Makefile stable/8/sys/modules/dtrace/systrace_linux32/Makefile stable/8/sys/modules/opensolaris/Makefile stable/8/sys/modules/zfs/Makefile Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/conf/ (props changed) stable/8/sys/modules/ (props changed) Copied: stable/8/sys/cddl/compat/opensolaris/sys/debug_compat.h (from r253996, head/sys/cddl/compat/opensolaris/sys/debug_compat.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/sys/cddl/compat/opensolaris/sys/debug_compat.h Fri Aug 23 14:18:24 2013 (r254705, copy of r253996, head/sys/cddl/compat/opensolaris/sys/debug_compat.h) @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2013 Andriy Gapon + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * This is a special file that SHOULD NOT be included using #include directive. + */ + +#if defined(INVARIANTS) +#ifndef DEBUG +#define DEBUG +#endif +#endif Modified: stable/8/sys/cddl/compat/opensolaris/sys/mutex.h ============================================================================== --- stable/8/sys/cddl/compat/opensolaris/sys/mutex.h Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/cddl/compat/opensolaris/sys/mutex.h Fri Aug 23 14:18:24 2013 (r254705) @@ -46,7 +46,7 @@ typedef enum { typedef struct sx kmutex_t; -#ifndef DEBUG +#ifndef OPENSOLARIS_WITNESS #define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else #define MUTEX_FLAGS (SX_DUPOK) Modified: stable/8/sys/cddl/compat/opensolaris/sys/rwlock.h ============================================================================== --- stable/8/sys/cddl/compat/opensolaris/sys/rwlock.h Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/cddl/compat/opensolaris/sys/rwlock.h Fri Aug 23 14:18:24 2013 (r254705) @@ -47,7 +47,7 @@ typedef enum { typedef struct sx krwlock_t; -#ifndef DEBUG +#ifndef OPENSOLARIS_WITNESS #define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else #define RW_FLAGS (SX_DUPOK) Modified: stable/8/sys/cddl/dev/dtrace/dtrace_load.c ============================================================================== --- stable/8/sys/cddl/dev/dtrace/dtrace_load.c Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/cddl/dev/dtrace/dtrace_load.c Fri Aug 23 14:18:24 2013 (r254705) @@ -73,7 +73,9 @@ dtrace_load(void *dummy) mutex_init(&dtrace_lock,"dtrace probe state", MUTEX_DEFAULT, NULL); mutex_init(&dtrace_provider_lock,"dtrace provider state", MUTEX_DEFAULT, NULL); mutex_init(&dtrace_meta_lock,"dtrace meta-provider state", MUTEX_DEFAULT, NULL); +#ifdef DEBUG mutex_init(&dtrace_errlock,"dtrace error lock", MUTEX_DEFAULT, NULL); +#endif mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); Modified: stable/8/sys/cddl/dev/dtrace/dtrace_unload.c ============================================================================== --- stable/8/sys/cddl/dev/dtrace/dtrace_unload.c Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/cddl/dev/dtrace/dtrace_unload.c Fri Aug 23 14:18:24 2013 (r254705) @@ -121,7 +121,9 @@ dtrace_unload() mutex_destroy(&dtrace_meta_lock); mutex_destroy(&dtrace_provider_lock); mutex_destroy(&dtrace_lock); +#ifdef DEBUG mutex_destroy(&dtrace_errlock); +#endif /* XXX Hack */ mutex_destroy(&mod_lock); Modified: stable/8/sys/conf/options ============================================================================== --- stable/8/sys/conf/options Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/conf/options Fri Aug 23 14:18:24 2013 (r254705) @@ -671,6 +671,7 @@ KTR_VERBOSE opt_ktr.h WITNESS opt_global.h WITNESS_KDB opt_witness.h WITNESS_SKIPSPIN opt_witness.h +OPENSOLARIS_WITNESS opt_global.h # options for ACPI support ACPI_DEBUG opt_acpi.h Modified: stable/8/sys/modules/cyclic/Makefile ============================================================================== --- stable/8/sys/modules/cyclic/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/cyclic/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -12,8 +12,8 @@ CFLAGS+= -I${.CURDIR}/../../cddl/compat/ -I${.CURDIR}/../.. \ -I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH:S/amd64/i386/} -CFLAGS+= -DDEBUG=1 - IGNORE_PRAGMA= 1 .include + +CFLAGS+= -include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/dtmalloc/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/dtmalloc/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/dtmalloc/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/dtnfsclient/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/dtnfsclient/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/dtnfsclient/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/dtrace/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/dtrace/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/dtrace/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -36,7 +36,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -DDIS_MEM -CFLAGS+= -DSMP -DDEBUG +CFLAGS+= -DSMP EXPORT_SYMS= dtrace_register \ dtrace_unregister \ @@ -46,6 +46,9 @@ dtrace_asm.o: assym.s .include +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h + CWARNFLAGS+= -Wno-parentheses CWARNFLAGS+= -Wno-uninitialized CWARNFLAGS+= -Wno-cast-qual +CWARNFLAGS+= -Wno-unused Modified: stable/8/sys/modules/dtrace/dtrace_test/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/dtrace_test/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/dtrace_test/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -12,3 +12,5 @@ CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= -D_KERNEL .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/dtraceall/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/dtraceall/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/dtraceall/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -15,3 +15,5 @@ opt_compat.h: .endif .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/fasttrap/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/fasttrap/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/fasttrap/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -15,6 +15,9 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel/dtrace .endif -CFLAGS+= -DSMP -DDEBUG +CFLAGS+= -DSMP .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h +CWARNFLAGS+= -Wno-unused Modified: stable/8/sys/modules/dtrace/fbt/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/fbt/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/fbt/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/lockstat/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/lockstat/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/lockstat/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -12,3 +12,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/profile/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/profile/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/profile/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/prototype/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/prototype/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/prototype/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/sdt/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/sdt/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/sdt/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/systrace/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/systrace/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/systrace/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/systrace_freebsd32/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/systrace_freebsd32/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/systrace_freebsd32/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -11,3 +11,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. -DFREEBSD32_SYSTRACE .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/dtrace/systrace_linux32/Makefile ============================================================================== --- stable/8/sys/modules/dtrace/systrace_linux32/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/dtrace/systrace_linux32/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -16,3 +16,5 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/comp -I${.CURDIR}/../../.. -DLINUX_SYSTRACE .include + +CFLAGS+= -include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/opensolaris/Makefile ============================================================================== --- stable/8/sys/modules/opensolaris/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/opensolaris/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -24,3 +24,5 @@ CFLAGS+= -I${.CURDIR}/../../cddl/compat/ IGNORE_PRAGMA= 1 .include + +CFLAGS+= -include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h Modified: stable/8/sys/modules/zfs/Makefile ============================================================================== --- stable/8/sys/modules/zfs/Makefile Fri Aug 23 14:17:45 2013 (r254704) +++ stable/8/sys/modules/zfs/Makefile Fri Aug 23 14:18:24 2013 (r254705) @@ -89,6 +89,8 @@ CFLAGS+=-DBUILDING_ZFS .include +CFLAGS+= -include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h + CWARNFLAGS+=-Wno-unknown-pragmas CWARNFLAGS+=-Wno-missing-prototypes CWARNFLAGS+=-Wno-undef