From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 18 13:12:45 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTPS id 95A50D87; Mon, 18 Nov 2013 13:12:45 +0000 (UTC) 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 8525F2965; Mon, 18 Nov 2013 13:12:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIDCjYp099753; Mon, 18 Nov 2013 13:12:45 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIDCjE3099752; Mon, 18 Nov 2013 13:12:45 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201311181312.rAIDCjE3099752@svn.freebsd.org> From: Alexander Motin Date: Mon, 18 Nov 2013 13:12:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258300 - stable/9/sys/vm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 13:12:45 -0000 Author: mav Date: Mon Nov 18 13:12:45 2013 New Revision: 258300 URL: http://svnweb.freebsd.org/changeset/base/258300 Log: MFC r239710 (by glebius): Fix function name in keg_cachespread_init() assert. Modified: stable/9/sys/vm/uma_core.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/uma_core.c ============================================================================== --- stable/9/sys/vm/uma_core.c Mon Nov 18 12:57:46 2013 (r258299) +++ stable/9/sys/vm/uma_core.c Mon Nov 18 13:12:45 2013 (r258300) @@ -1233,7 +1233,7 @@ keg_cachespread_init(uma_keg_t keg) keg->uk_ipers = ((pages * PAGE_SIZE) + trailer) / rsize; keg->uk_flags |= UMA_ZONE_OFFPAGE | UMA_ZONE_VTOSLAB; KASSERT(keg->uk_ipers <= uma_max_ipers, - ("keg_small_init: keg->uk_ipers too high(%d) increase max_ipers", + ("%s: keg->uk_ipers too high(%d) increase max_ipers", __func__, keg->uk_ipers)); } From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 18 13:17:57 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTPS id 6A19FF3A; Mon, 18 Nov 2013 13:17:57 +0000 (UTC) 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 59A8D29A1; Mon, 18 Nov 2013 13:17:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIDHv4c000713; Mon, 18 Nov 2013 13:17:57 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIDHv2P000712; Mon, 18 Nov 2013 13:17:57 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201311181317.rAIDHv2P000712@svn.freebsd.org> From: Alexander Motin Date: Mon, 18 Nov 2013 13:17:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258301 - stable/9/sys/vm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 13:17:57 -0000 Author: mav Date: Mon Nov 18 13:17:56 2013 New Revision: 258301 URL: http://svnweb.freebsd.org/changeset/base/258301 Log: MFC r240676 (by glebius): If caller specifies UMA_ZONE_OFFPAGE explicitly, then do not waste memory in an allocation for a slab. Modified: stable/9/sys/vm/uma_core.c Modified: stable/9/sys/vm/uma_core.c ============================================================================== --- stable/9/sys/vm/uma_core.c Mon Nov 18 13:12:45 2013 (r258300) +++ stable/9/sys/vm/uma_core.c Mon Nov 18 13:17:56 2013 (r258301) @@ -1122,7 +1122,9 @@ keg_small_init(uma_keg_t keg) keg->uk_rsize = rsize; keg->uk_ppera = 1; - if (keg->uk_flags & UMA_ZONE_REFCNT) { + if (keg->uk_flags & UMA_ZONE_OFFPAGE) { + shsize = 0; + } else if (keg->uk_flags & UMA_ZONE_REFCNT) { rsize += UMA_FRITMREF_SZ; /* linkage & refcnt */ shsize = sizeof(struct uma_slab_refcnt); } else { From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 18 13:20:21 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 602E924D; Mon, 18 Nov 2013 13:20:21 +0000 (UTC) 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 4F97929C7; Mon, 18 Nov 2013 13:20:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIDKLTh003113; Mon, 18 Nov 2013 13:20:21 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIDKL7N003112; Mon, 18 Nov 2013 13:20:21 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201311181320.rAIDKL7N003112@svn.freebsd.org> From: Alexander Motin Date: Mon, 18 Nov 2013 13:20:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258302 - stable/9/sys/vm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 13:20:21 -0000 Author: mav Date: Mon Nov 18 13:20:20 2013 New Revision: 258302 URL: http://svnweb.freebsd.org/changeset/base/258302 Log: MFC r246087 (by glebius): Fix typo in debug printf. Modified: stable/9/sys/vm/uma_core.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/uma_core.c ============================================================================== --- stable/9/sys/vm/uma_core.c Mon Nov 18 13:17:56 2013 (r258301) +++ stable/9/sys/vm/uma_core.c Mon Nov 18 13:20:20 2013 (r258302) @@ -1678,7 +1678,7 @@ uma_startup(void *bootmem, int boot_page #ifdef UMA_DEBUG printf("Calculated uma_max_ipers (for OFFPAGE) is %d\n", uma_max_ipers); - printf("Calculated uma_max_ipers_slab (for OFFPAGE) is %d\n", + printf("Calculated uma_max_ipers_ref (for OFFPAGE) is %d\n", uma_max_ipers_ref); #endif From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 18 17:03:12 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTPS id 3633BB90; Mon, 18 Nov 2013 17:03:12 +0000 (UTC) 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 164562820; Mon, 18 Nov 2013 17:03:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIH3Bs3092826; Mon, 18 Nov 2013 17:03:11 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIH3BwC092824; Mon, 18 Nov 2013 17:03:11 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311181703.rAIH3BwC092824@svn.freebsd.org> From: Glen Barber Date: Mon, 18 Nov 2013 17:03:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258312 - in stable/9: release share/man/man7 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 17:03:12 -0000 Author: gjb Date: Mon Nov 18 17:03:11 2013 New Revision: 258312 URL: http://svnweb.freebsd.org/changeset/base/258312 Log: MFC r257805, r257806, r257807: r257805: Add a 'mini-memstick.img' release target, which will use the 'bootonly.iso' components to create a smaller memory stick image. This is useful for system recovery, where a full memstick.img image is not necessarily needed (or wanted). In addition, it is possible to do bootonly-style installation, where the base.txz, kernel.txz, etc. are fetched from a remote source. Provide backwards-compatible target (mini-memstick), to keep in sync with the targets documented in release/Makefile. r257806: Remove extra target from 'memstick' in r257805. r257807: Update release(7) to include 'mini-memstick' target. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/Makefile stable/9/share/man/man7/release.7 Directory Properties: stable/9/release/ (props changed) stable/9/share/man/man7/ (props changed) Modified: stable/9/release/Makefile ============================================================================== --- stable/9/release/Makefile Mon Nov 18 16:51:56 2013 (r258311) +++ stable/9/release/Makefile Mon Nov 18 17:03:11 2013 (r258312) @@ -5,6 +5,7 @@ # User-driven targets: # cdrom: Builds release CD-ROM media (disc1.iso) # memstick: Builds memory stick image (memstick.img) +# mini-memstick: Builds minimal memory stick image (mini-memstick.img) # ftp: Sets up FTP distribution area (ftp) # release: Build all media and FTP distribution area # install: Copies all release media into ${DESTDIR} @@ -74,7 +75,9 @@ IMAGES+= disc1.iso bootonly.iso .endif .if exists(${.CURDIR}/${TARGET}/make-memstick.sh) RELEASE_TARGETS+= memstick.img +RELEASE_TARGETS+= mini-memstick.img IMAGES+= memstick.img +IMAGES+= mini-memstick.img .endif .include @@ -181,6 +184,10 @@ memstick: memstick.img memstick.img: system sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET} +mini-memstick: mini-memstick.img +mini-memstick.img: system + sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET} + packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET} Modified: stable/9/share/man/man7/release.7 ============================================================================== --- stable/9/share/man/man7/release.7 Mon Nov 18 16:51:56 2013 (r258311) +++ stable/9/share/man/man7/release.7 Mon Nov 18 17:03:11 2013 (r258312) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 31, 2013 +.Dd November 7, 2013 .Dt RELEASE 7 .Os .Sh NAME @@ -175,6 +175,11 @@ Not applicable on all platforms. Require .Xr md 4 (memory disk) device driver be present in the kernel (either by being compiled in or available as a module). +.It Cm mini-memstick +Similar to +.Cm memstick , +with the exception that the installation distribution sets +are not included. .It Cm ftp Creates a directory named .Pa ftp From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 18 17:06:34 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTPS id 992FFD52; Mon, 18 Nov 2013 17:06:34 +0000 (UTC) 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 6EDEB284B; Mon, 18 Nov 2013 17:06:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIH6YEG093391; Mon, 18 Nov 2013 17:06:34 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIH6YT6093390; Mon, 18 Nov 2013 17:06:34 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201311181706.rAIH6YT6093390@svn.freebsd.org> From: Glen Barber Date: Mon, 18 Nov 2013 17:06:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258313 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 17:06:34 -0000 Author: gjb Date: Mon Nov 18 17:06:33 2013 New Revision: 258313 URL: http://svnweb.freebsd.org/changeset/base/258313 Log: MFC r257942, r258101: r257942: Fix a few style nits. r258101: Since the doc/ toolchain conversion to docbook 5.0, JADETEX is no longer a valid option, so remove 'WITHOUT_JADETEX=yes' from PBUILD_FLAGS. While here, also remove 'WITHOUT_X11=yes', since it will cause a dependency conflict by requiring both print/ghostscript9 and print/ghostscript9-nox11. Switch to OPTIONSNG format (WITHOUT_* -> OPTIONS_UNSET='FOO'), and unset the FOP option, which requires Java (although it is disabled by default). Also unset the 'IGOR' option, since textproc/igor is a validation tool, not necessarily a dependency of the doc/ build itself. While here, reduce the line length of PBUILD_FLAGS. Sponsored by: The FreeBSD Foundation Modified: stable/9/release/release.sh Directory Properties: stable/9/release/ (props changed) Modified: stable/9/release/release.sh ============================================================================== --- stable/9/release/release.sh Mon Nov 18 17:03:11 2013 (r258312) +++ stable/9/release/release.sh Mon Nov 18 17:06:33 2013 (r258313) @@ -125,10 +125,10 @@ fi # instead of their values. DOCPORTS= if [ "x${NOPORTS}" != "x" ]; then - DOCPORTS="NOPORTS=yes " + DOCPORTS="NOPORTS=yes " fi if [ "x${NODOC}" != "x" ]; then - DOCPORTS="${DOCPORTS}NODOC=yes" + DOCPORTS="${DOCPORTS}NODOC=yes" fi # The aggregated build-time flags based upon variables defined within @@ -147,7 +147,7 @@ RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCO # Force src checkout if configured FORCE_SRC_KEY= if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then - FORCE_SRC_KEY="--force" + FORCE_SRC_KEY="--force" fi if [ ! ${CHROOTDIR} ]; then @@ -189,7 +189,8 @@ build_doc_ports() { ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then - PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_X11=yes BATCH=yes" + PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes" + PBUILD_FLAGS="${PBUILD_FLAGS} OPTIONS_UNSET='FOP IGOR'" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ ${PBUILD_FLAGS} install clean distclean fi From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 19 11:11:52 2013 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A12943E; Tue, 19 Nov 2013 11:11:52 +0000 (UTC) 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 28D45280F; Tue, 19 Nov 2013 11:11:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJBBp8B072050; Tue, 19 Nov 2013 11:11:51 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJBBpRH072047; Tue, 19 Nov 2013 11:11:51 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201311191111.rAJBBpRH072047@svn.freebsd.org> From: Sergey Kandaurov Date: Tue, 19 Nov 2013 11:11:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258341 - in stable/9: . lib/libc/sys X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Nov 2013 11:11:52 -0000 Author: pluknet Date: Tue Nov 19 11:11:51 2013 New Revision: 258341 URL: http://svnweb.freebsd.org/changeset/base/258341 Log: MFC r257874: Fix extattr(2) MLINKS. Modified: stable/9/ObsoleteFiles.inc (contents, props changed) stable/9/lib/libc/sys/Makefile.inc Directory Properties: stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) Modified: stable/9/ObsoleteFiles.inc ============================================================================== --- stable/9/ObsoleteFiles.inc Tue Nov 19 10:51:46 2013 (r258340) +++ stable/9/ObsoleteFiles.inc Tue Nov 19 11:11:51 2013 (r258341) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20131109: extattr(2) mlinks fixed +OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz +OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz # 20130704: new clang import which bumps version from 3.2 to 3.3. OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h Modified: stable/9/lib/libc/sys/Makefile.inc ============================================================================== --- stable/9/lib/libc/sys/Makefile.inc Tue Nov 19 10:51:46 2013 (r258340) +++ stable/9/lib/libc/sys/Makefile.inc Tue Nov 19 11:11:51 2013 (r258341) @@ -137,9 +137,9 @@ MLINKS+=execve.2 fexecve.2 MLINKS+=extattr_get_file.2 extattr.2 \ extattr_get_file.2 extattr_delete_fd.2 \ extattr_get_file.2 extattr_delete_file.2 \ - extattr_get_file.2 extattr_delete_list.2 \ + extattr_get_file.2 extattr_delete_link.2 \ extattr_get_file.2 extattr_get_fd.2 \ - extattr_get_file.2 extattr_get_list.2 \ + extattr_get_file.2 extattr_get_link.2 \ extattr_get_file.2 extattr_list_fd.2 \ extattr_get_file.2 extattr_list_file.2 \ extattr_get_file.2 extattr_list_link.2 \ From owner-svn-src-stable-9@FreeBSD.ORG Thu Nov 21 20:09:45 2013 Return-Path: Delivered-To: svn-src-stable-9@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 ESMTPS id E47B2318; Thu, 21 Nov 2013 20:09:44 +0000 (UTC) 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 D1C4E21B0; Thu, 21 Nov 2013 20:09:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALK9ir6038134; Thu, 21 Nov 2013 20:09:44 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALK9iMu038131; Thu, 21 Nov 2013 20:09:44 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201311212009.rALK9iMu038131@svn.freebsd.org> From: John Baldwin Date: Thu, 21 Nov 2013 20:09:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r258442 - in stable/9/usr.bin: kdump truss X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2013 20:09:45 -0000 Author: jhb Date: Thu Nov 21 20:09:44 2013 New Revision: 258442 URL: http://svnweb.freebsd.org/changeset/base/258442 Log: MFC 226145,226147,226148,226150,226151,226153,226157,226158,226164,226246, 226262,226329,226344,226608: Merge most "infrastructure" changes to kdump to make other MFC's to add new decodings, etc. easier: - Some of the #defines or enums for which we auto-generate naming functions may be wider than int, so use intmax_t throughout. - Auto-generate kdump_subr.h. - Use a switch statement instead of a giant if-else. - Remove a lot of (void) casts. - Bring ioctlname() in line with all the other *name() functions, which actually print the name (or the numeric value, if they can't figure out the correct name) instead of just returning a pointer to it. Also, since ioctl numbers are not and probably never will be unique, drop support for using a switch statement instead of an if/else chain. - Mostly WARNS=6 clean. - Update mkioctls to still work with both kdump and truss. Deleted: stable/9/usr.bin/kdump/kdump_subr.h Modified: stable/9/usr.bin/kdump/Makefile stable/9/usr.bin/kdump/kdump.c stable/9/usr.bin/kdump/mkioctls stable/9/usr.bin/kdump/mksubr stable/9/usr.bin/truss/Makefile stable/9/usr.bin/truss/extern.h Directory Properties: stable/9/usr.bin/kdump/ (props changed) stable/9/usr.bin/truss/ (props changed) Modified: stable/9/usr.bin/kdump/Makefile ============================================================================== --- stable/9/usr.bin/kdump/Makefile Thu Nov 21 20:07:58 2013 (r258441) +++ stable/9/usr.bin/kdump/Makefile Thu Nov 21 20:09:44 2013 (r258442) @@ -8,23 +8,28 @@ SFX= 32 .PATH: ${.CURDIR}/../ktrace PROG= kdump -SRCS= kdump.c ioctl.c kdump_subr.c subr.c -CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. +SRCS= kdump_subr.c kdump.c ioctl.c subr.c +DPSRCS= kdump_subr.h +CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I. .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= linux_syscalls.c .endif -WARNS?= 0 +NO_WERROR?= YES -CLEANFILES= ioctl.c kdump_subr.c linux_syscalls.c +CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c ioctl.c: mkioctls - env CPP="${CPP}" \ - sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} + env MACHINE=${MACHINE} CPP="${CPP}" \ + sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} -kdump_subr.c: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET} +kdump_subr.h: mksubr + sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ + sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET} + +kdump_subr.c: mksubr kdump_subr.h + sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET} linux_syscalls.c: /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ Modified: stable/9/usr.bin/kdump/kdump.c ============================================================================== --- stable/9/usr.bin/kdump/kdump.c Thu Nov 21 20:07:58 2013 (r258441) +++ stable/9/usr.bin/kdump/kdump.c Thu Nov 21 20:09:44 2013 (r258442) @@ -96,6 +96,8 @@ void ktrgenio(struct ktr_genio *, int); void ktrpsig(struct ktr_psig *); void ktrcsw(struct ktr_csw *); void ktrcsw_old(struct ktr_csw_old *); +void ktruser_malloc(unsigned char *); +void ktruser_rtld(int, unsigned char *); void ktruser(int, unsigned char *); void ktrsockaddr(struct sockaddr *); void ktrstat(struct stat *); @@ -103,8 +105,7 @@ void ktrstruct(char *, size_t); void ktrfault(struct ktr_fault *); void ktrfaultend(struct ktr_faultend *); void usage(void); -void sockfamilyname(int); -const char *ioctlname(u_long); +void ioctlname(unsigned long, int); int timestamp, decimal, fancy = 1, suppressdata, tail, threads, maxdata, resolv = 0, abiflag = 0; @@ -114,15 +115,15 @@ struct ktr_header ktr_header; #define TIME_FORMAT "%b %e %T %Y" #define eqs(s1, s2) (strcmp((s1), (s2)) == 0) -#define print_number(i,n,c) do { \ - if (decimal) \ - printf("%c%ld", c, (long)*i); \ - else \ - printf("%c%#lx", c, (long)*i); \ - i++; \ - n--; \ - c = ','; \ - } while (0); +#define print_number(i,n,c) do { \ + if (decimal) \ + printf("%c%jd", c, (intmax_t)*i); \ + else \ + printf("%c%#jx", c, (uintmax_t)(u_register_t)*i); \ + i++; \ + n--; \ + c = ','; \ +} while (0) #if defined(__amd64__) || defined(__i386__) @@ -168,10 +169,10 @@ main(int argc, char *argv[]) pid_t pid = 0; u_int sv_flags; - (void) setlocale(LC_CTYPE, ""); + setlocale(LC_CTYPE, ""); while ((ch = getopt(argc,argv,"f:dElm:np:AHRrsTt:")) != -1) - switch((char)ch) { + switch (ch) { case 'A': abiflag = 1; break; @@ -223,7 +224,7 @@ main(int argc, char *argv[]) if (argc > optind) usage(); - m = (void *)malloc(size = 1025); + m = malloc(size = 1025); if (m == NULL) errx(1, "%s", strerror(ENOMEM)); if (!freopen(tracefile, "r", stdin)) @@ -234,7 +235,7 @@ main(int argc, char *argv[]) if (ktr_header.ktr_type & KTR_DROP) { ktr_header.ktr_type &= ~KTR_DROP; if (!drop_logged && threads) { - (void)printf( + printf( "%6jd %6jd %-8.*s Events dropped.\n", (intmax_t)ktr_header.ktr_pid, ktr_header.ktr_tid > 0 ? @@ -242,7 +243,7 @@ main(int argc, char *argv[]) MAXCOMLEN, ktr_header.ktr_comm); drop_logged = 1; } else if (!drop_logged) { - (void)printf("%6jd %-8.*s Events dropped.\n", + printf("%6jd %-8.*s Events dropped.\n", (intmax_t)ktr_header.ktr_pid, MAXCOMLEN, ktr_header.ktr_comm); drop_logged = 1; @@ -255,7 +256,7 @@ main(int argc, char *argv[]) if ((ktrlen = ktr_header.ktr_len) < 0) errx(1, "bogus length 0x%x", ktrlen); if (ktrlen > size) { - m = (void *)realloc(m, ktrlen+1); + m = realloc(m, ktrlen+1); if (m == NULL) errx(1, "%s", strerror(ENOMEM)); size = ktrlen; @@ -321,7 +322,7 @@ main(int argc, char *argv[]) break; } if (tail) - (void)fflush(stdout); + fflush(stdout); } return 0; } @@ -332,7 +333,7 @@ fread_tail(void *buf, int size, int num) int i; while ((i = fread(buf, size, num, stdin)) == 0 && tail) { - (void)sleep(1); + sleep(1); clearerr(stdin); } return (i); @@ -462,7 +463,7 @@ dumpheader(struct ktr_header *kth) type = "PRET"; break; default: - (void)sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type); + sprintf(unknown, "UNKNOWN(%d)", kth->ktr_type); type = unknown; } @@ -475,11 +476,11 @@ dumpheader(struct ktr_header *kth) * negative tid's as 0. */ if (threads) - (void)printf("%6jd %6jd %-8.*s ", (intmax_t)kth->ktr_pid, + printf("%6jd %6jd %-8.*s ", (intmax_t)kth->ktr_pid, kth->ktr_tid > 0 ? (intmax_t)kth->ktr_tid : 0, MAXCOMLEN, kth->ktr_comm); else - (void)printf("%6jd %-8.*s ", (intmax_t)kth->ktr_pid, MAXCOMLEN, + printf("%6jd %-8.*s ", (intmax_t)kth->ktr_pid, MAXCOMLEN, kth->ktr_comm); if (timestamp) { if (timestamp == 3) { @@ -492,10 +493,10 @@ dumpheader(struct ktr_header *kth) timevalsub(&kth->ktr_time, &prevtime); prevtime = temp; } - (void)printf("%jd.%06ld ", (intmax_t)kth->ktr_time.tv_sec, + printf("%jd.%06ld ", (intmax_t)kth->ktr_time.tv_sec, kth->ktr_time.tv_usec); } - (void)printf("%s ", type); + printf("%s ", type); } #include @@ -512,465 +513,509 @@ ktrsyscall(struct ktr_syscall *ktr, u_in if ((flags != 0 && ((flags & SV_ABI_MASK) != SV_ABI_FREEBSD)) || (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)) - (void)printf("[%d]", ktr->ktr_code); + printf("[%d]", ktr->ktr_code); else - (void)printf("%s", syscallnames[ktr->ktr_code]); + printf("%s", syscallnames[ktr->ktr_code]); ip = &ktr->ktr_args[0]; if (narg) { char c = '('; if (fancy && (flags == 0 || (flags & SV_ABI_MASK) == SV_ABI_FREEBSD)) { - if (ktr->ktr_code == SYS_ioctl) { - const char *cp; - print_number(ip,narg,c); - if ((cp = ioctlname(*ip)) != NULL) - (void)printf(",%s", cp); - else { - if (decimal) - (void)printf(",%ld", (long)*ip); - else - (void)printf(",%#lx ", (long)*ip); - } + switch (ktr->ktr_code) { + case SYS_ioctl: { + print_number(ip, narg, c); + putchar(c); + ioctlname(*ip, decimal); c = ','; ip++; narg--; - } else if (ktr->ktr_code == SYS_ptrace) { - (void)putchar('('); - ptraceopname ((int)*ip); + break; + } + case SYS_ptrace: + putchar('('); + ptraceopname(*ip); c = ','; ip++; narg--; - } else if (ktr->ktr_code == SYS_access || - ktr->ktr_code == SYS_eaccess) { - print_number(ip,narg,c); - (void)putchar(','); - accessmodename ((int)*ip); + break; + case SYS_access: + case SYS_eaccess: + print_number(ip, narg, c); + putchar(','); + accessmodename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_open) { - int flags; - int mode; - print_number(ip,narg,c); - flags = *ip; - mode = *++ip; - (void)putchar(','); - flagsandmodename (flags, mode, decimal); - ip++; - narg-=2; - } else if (ktr->ktr_code == SYS_wait4) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - wait4optname ((int)*ip); + break; + case SYS_open: + print_number(ip, narg, c); + putchar(','); + flagsandmodename(ip[0], ip[1], decimal); + ip += 2; + narg -= 2; + break; + case SYS_wait4: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + wait4optname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_chmod || - ktr->ktr_code == SYS_fchmod || - ktr->ktr_code == SYS_lchmod) { - print_number(ip,narg,c); - (void)putchar(','); - modename ((int)*ip); + break; + case SYS_chmod: + case SYS_fchmod: + case SYS_lchmod: + print_number(ip, narg, c); + putchar(','); + modename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mknod) { - print_number(ip,narg,c); - (void)putchar(','); - modename ((int)*ip); + break; + case SYS_mknod: + print_number(ip, narg, c); + putchar(','); + modename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_getfsstat) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - getfsstatflagsname ((int)*ip); + break; + case SYS_getfsstat: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + getfsstatflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mount) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - mountflagsname ((int)*ip); + break; + case SYS_mount: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + mountflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_unmount) { - print_number(ip,narg,c); - (void)putchar(','); - mountflagsname ((int)*ip); + break; + case SYS_unmount: + print_number(ip, narg, c); + putchar(','); + mountflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_recvmsg || - ktr->ktr_code == SYS_sendmsg) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - sendrecvflagsname ((int)*ip); + break; + case SYS_recvmsg: + case SYS_sendmsg: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + sendrecvflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_recvfrom || - ktr->ktr_code == SYS_sendto) { - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - sendrecvflagsname ((int)*ip); + break; + case SYS_recvfrom: + case SYS_sendto: + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + sendrecvflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_chflags || - ktr->ktr_code == SYS_fchflags || - ktr->ktr_code == SYS_lchflags) { - print_number(ip,narg,c); - (void)putchar(','); - modename((int)*ip); + break; + case SYS_chflags: + case SYS_fchflags: + case SYS_lchflags: + print_number(ip, narg, c); + putchar(','); + modename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kill) { - print_number(ip,narg,c); - (void)putchar(','); - signame((int)*ip); + break; + case SYS_kill: + print_number(ip, narg, c); + putchar(','); + signame(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_reboot) { - (void)putchar('('); - rebootoptname((int)*ip); + break; + case SYS_reboot: + putchar('('); + rebootoptname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_umask) { - (void)putchar('('); - modename((int)*ip); + break; + case SYS_umask: + putchar('('); + modename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_msync) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - msyncflagsname((int)*ip); + break; + case SYS_msync: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + msyncflagsname(*ip); ip++; narg--; + break; #ifdef SYS_freebsd6_mmap - } else if (ktr->ktr_code == SYS_freebsd6_mmap) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - mmapprotname ((int)*ip); - (void)putchar(','); + case SYS_freebsd6_mmap: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + mmapprotname(*ip); + putchar(','); ip++; narg--; - mmapflagsname ((int)*ip); + mmapflagsname(*ip); ip++; narg--; + break; #endif - } else if (ktr->ktr_code == SYS_mmap) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - mmapprotname ((int)*ip); - (void)putchar(','); + case SYS_mmap: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + mmapprotname(*ip); + putchar(','); ip++; narg--; - mmapflagsname ((int)*ip); + mmapflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mprotect) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - mmapprotname ((int)*ip); + break; + case SYS_mprotect: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + mmapprotname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_madvise) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - madvisebehavname((int)*ip); + break; + case SYS_madvise: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + madvisebehavname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_setpriority) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - prioname((int)*ip); + break; + case SYS_setpriority: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + prioname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_fcntl) { - int cmd; - int arg; - print_number(ip,narg,c); - cmd = *ip; - arg = *++ip; - (void)putchar(','); - fcntlcmdname(cmd, arg, decimal); - ip++; - narg-=2; - } else if (ktr->ktr_code == SYS_socket) { + break; + case SYS_fcntl: + print_number(ip, narg, c); + putchar(','); + fcntlcmdname(ip[0], ip[1], decimal); + ip += 2; + narg -= 2; + break; + case SYS_socket: { int sockdomain; - (void)putchar('('); - sockdomain=(int)*ip; + putchar('('); + sockdomain = *ip; sockdomainname(sockdomain); ip++; narg--; - (void)putchar(','); - socktypename((int)*ip); + putchar(','); + socktypename(*ip); ip++; narg--; if (sockdomain == PF_INET || sockdomain == PF_INET6) { - (void)putchar(','); - sockipprotoname((int)*ip); + putchar(','); + sockipprotoname(*ip); ip++; narg--; } c = ','; - } else if (ktr->ktr_code == SYS_setsockopt || - ktr->ktr_code == SYS_getsockopt) { - print_number(ip,narg,c); - (void)putchar(','); - sockoptlevelname((int)*ip, decimal); - if ((int)*ip == SOL_SOCKET) { + break; + } + case SYS_setsockopt: + case SYS_getsockopt: + print_number(ip, narg, c); + putchar(','); + sockoptlevelname(*ip, decimal); + if (*ip == SOL_SOCKET) { ip++; narg--; - (void)putchar(','); - sockoptname((int)*ip); + putchar(','); + sockoptname(*ip); } ip++; narg--; + break; #ifdef SYS_freebsd6_lseek - } else if (ktr->ktr_code == SYS_freebsd6_lseek) { - print_number(ip,narg,c); + case SYS_freebsd6_lseek: + print_number(ip, narg, c); /* Hidden 'pad' argument, not in lseek(2) */ - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - whencename ((int)*ip); + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + whencename(*ip); ip++; narg--; + break; #endif - } else if (ktr->ktr_code == SYS_lseek) { - print_number(ip,narg,c); + case SYS_lseek: + print_number(ip, narg, c); /* Hidden 'pad' argument, not in lseek(2) */ - print_number(ip,narg,c); - (void)putchar(','); - whencename ((int)*ip); + print_number(ip, narg, c); + putchar(','); + whencename(*ip); ip++; narg--; - - } else if (ktr->ktr_code == SYS_flock) { - print_number(ip,narg,c); - (void)putchar(','); - flockname((int)*ip); + break; + case SYS_flock: + print_number(ip, narg, c); + putchar(','); + flockname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_mkfifo || - ktr->ktr_code == SYS_mkdir) { - print_number(ip,narg,c); - (void)putchar(','); - modename((int)*ip); + break; + case SYS_mkfifo: + case SYS_mkdir: + print_number(ip, narg, c); + putchar(','); + modename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shutdown) { - print_number(ip,narg,c); - (void)putchar(','); - shutdownhowname((int)*ip); + break; + case SYS_shutdown: + print_number(ip, narg, c); + putchar(','); + shutdownhowname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_socketpair) { - (void)putchar('('); - sockdomainname((int)*ip); + break; + case SYS_socketpair: + putchar('('); + sockdomainname(*ip); ip++; narg--; - (void)putchar(','); - socktypename((int)*ip); + putchar(','); + socktypename(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_getrlimit || - ktr->ktr_code == SYS_setrlimit) { - (void)putchar('('); - rlimitname((int)*ip); + break; + case SYS_getrlimit: + case SYS_setrlimit: + putchar('('); + rlimitname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_quotactl) { - print_number(ip,narg,c); - (void)putchar(','); - quotactlname((int)*ip); + break; + case SYS_quotactl: + print_number(ip, narg, c); + putchar(','); + quotactlname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_nfssvc) { - (void)putchar('('); - nfssvcname((int)*ip); + break; + case SYS_nfssvc: + putchar('('); + nfssvcname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_rtprio) { - (void)putchar('('); - rtprioname((int)*ip); + break; + case SYS_rtprio: + putchar('('); + rtprioname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS___semctl) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - semctlname((int)*ip); + break; + case SYS___semctl: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + semctlname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_semget) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - semgetname((int)*ip); + break; + case SYS_semget: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + semgetname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_msgctl) { - print_number(ip,narg,c); - (void)putchar(','); - shmctlname((int)*ip); + break; + case SYS_msgctl: + print_number(ip, narg, c); + putchar(','); + shmctlname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shmat) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - shmatname((int)*ip); + break; + case SYS_shmat: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + shmatname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_shmctl) { - print_number(ip,narg,c); - (void)putchar(','); - shmctlname((int)*ip); + break; + case SYS_shmctl: + print_number(ip, narg, c); + putchar(','); + shmctlname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_minherit) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - minheritname((int)*ip); + break; + case SYS_minherit: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + minheritname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_rfork) { - (void)putchar('('); - rforkname((int)*ip); + break; + case SYS_rfork: + putchar('('); + rforkname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_lio_listio) { - (void)putchar('('); - lio_listioname((int)*ip); + break; + case SYS_lio_listio: + putchar('('); + lio_listioname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_mlockall) { - (void)putchar('('); - mlockallname((int)*ip); + break; + case SYS_mlockall: + putchar('('); + mlockallname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sched_setscheduler) { - print_number(ip,narg,c); - (void)putchar(','); - schedpolicyname((int)*ip); + break; + case SYS_sched_setscheduler: + print_number(ip, narg, c); + putchar(','); + schedpolicyname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sched_get_priority_max || - ktr->ktr_code == SYS_sched_get_priority_min) { - (void)putchar('('); - schedpolicyname((int)*ip); - ip++; - narg--; - } else if (ktr->ktr_code == SYS_sendfile) { - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - sendfileflagsname((int)*ip); + break; + case SYS_sched_get_priority_max: + case SYS_sched_get_priority_min: + putchar('('); + schedpolicyname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kldsym) { - print_number(ip,narg,c); - (void)putchar(','); - kldsymcmdname((int)*ip); + break; + case SYS_sendfile: + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + sendfileflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sigprocmask) { - (void)putchar('('); - sigprocmaskhowname((int)*ip); + break; + case SYS_kldsym: + print_number(ip, narg, c); + putchar(','); + kldsymcmdname(*ip); + ip++; + narg--; + break; + case SYS_sigprocmask: + putchar('('); + sigprocmaskhowname(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS___acl_get_file || - ktr->ktr_code == SYS___acl_set_file || - ktr->ktr_code == SYS___acl_get_fd || - ktr->ktr_code == SYS___acl_set_fd || - ktr->ktr_code == SYS___acl_delete_file || - ktr->ktr_code == SYS___acl_delete_fd || - ktr->ktr_code == SYS___acl_aclcheck_file || - ktr->ktr_code == SYS___acl_aclcheck_fd || - ktr->ktr_code == SYS___acl_get_link || - ktr->ktr_code == SYS___acl_set_link || - ktr->ktr_code == SYS___acl_delete_link || - ktr->ktr_code == SYS___acl_aclcheck_link) { - print_number(ip,narg,c); - (void)putchar(','); - acltypename((int)*ip); + break; + case SYS___acl_get_file: + case SYS___acl_set_file: + case SYS___acl_get_fd: + case SYS___acl_set_fd: + case SYS___acl_delete_file: + case SYS___acl_delete_fd: + case SYS___acl_aclcheck_file: + case SYS___acl_aclcheck_fd: + case SYS___acl_get_link: + case SYS___acl_set_link: + case SYS___acl_delete_link: + case SYS___acl_aclcheck_link: + print_number(ip, narg, c); + putchar(','); + acltypename(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_sigaction) { - (void)putchar('('); - signame((int)*ip); + break; + case SYS_sigaction: + putchar('('); + signame(*ip); ip++; narg--; c = ','; - } else if (ktr->ktr_code == SYS_extattrctl) { - print_number(ip,narg,c); - (void)putchar(','); - extattrctlname((int)*ip); + break; + case SYS_extattrctl: + print_number(ip, narg, c); + putchar(','); + extattrctlname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_nmount) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - mountflagsname ((int)*ip); + break; + case SYS_nmount: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + mountflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_thr_create) { - print_number(ip,narg,c); - print_number(ip,narg,c); - (void)putchar(','); - thrcreateflagsname ((int)*ip); + break; + case SYS_thr_create: + print_number(ip, narg, c); + print_number(ip, narg, c); + putchar(','); + thrcreateflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_thr_kill) { - print_number(ip,narg,c); - (void)putchar(','); - signame ((int)*ip); + break; + case SYS_thr_kill: + print_number(ip, narg, c); + putchar(','); + signame(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_kldunloadf) { - print_number(ip,narg,c); - (void)putchar(','); - kldunloadfflagsname ((int)*ip); + break; + case SYS_kldunloadf: + print_number(ip, narg, c); + putchar(','); + kldunloadfflagsname(*ip); ip++; narg--; - } else if (ktr->ktr_code == SYS_posix_fadvise) { - print_number(ip,narg,c); - print_number(ip,narg,c); - print_number(ip,narg,c); + break; + case SYS_posix_fadvise: + print_number(ip, narg, c); + print_number(ip, narg, c); + print_number(ip, narg, c); (void)putchar(','); fadvisebehavname((int)*ip); ip++; narg--; + break; } } while (narg > 0) { - print_number(ip,narg,c); + print_number(ip, narg, c); } - (void)putchar(')'); + putchar(')'); } - (void)putchar('\n'); + putchar('\n'); } void *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***