From owner-svn-src-stable@freebsd.org Wed May 30 18:27:49 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 446CEFD1A01; Wed, 30 May 2018 18:27:49 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DDC7D71B22; Wed, 30 May 2018 18:27:48 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9B9D6B63; Wed, 30 May 2018 18:27:48 +0000 (UTC) (envelope-from dteske@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4UIRmaH010622; Wed, 30 May 2018 18:27:48 GMT (envelope-from dteske@FreeBSD.org) Received: (from dteske@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4UIRmwM010620; Wed, 30 May 2018 18:27:48 GMT (envelope-from dteske@FreeBSD.org) Message-Id: <201805301827.w4UIRmwM010620@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dteske set sender to dteske@FreeBSD.org using -f From: Devin Teske Date: Wed, 30 May 2018 18:27:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r334392 - in stable/11: cddl/usr.sbin/dwatch sys/sys X-SVN-Group: stable-11 X-SVN-Commit-Author: dteske X-SVN-Commit-Paths: in stable/11: cddl/usr.sbin/dwatch sys/sys X-SVN-Commit-Revision: 334392 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2018 18:27:49 -0000 Author: dteske Date: Wed May 30 18:27:48 2018 New Revision: 334392 URL: https://svnweb.freebsd.org/changeset/base/334392 Log: MFC SVN r334261-334262,334359: dwatch(1) touch-ups r334261: Guard against error when given -t "*..." r334262: Eliminate ANSI dimming in developer mode r334359: Fix "-t test" for post-processing profiles Bump FreeBSD_version directly in stable/11 for ports IGNORE (as in r334290) Reviewed by: gjb Approved by: re (gjb) Sponsored by: Smule, Inc. Modified: stable/11/cddl/usr.sbin/dwatch/dwatch stable/11/sys/sys/param.h Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/usr.sbin/dwatch/dwatch ============================================================================== --- stable/11/cddl/usr.sbin/dwatch/dwatch Wed May 30 18:04:25 2018 (r334391) +++ stable/11/cddl/usr.sbin/dwatch/dwatch Wed May 30 18:27:48 2018 (r334392) @@ -47,7 +47,7 @@ DTRACE_PRAGMA=" ############################################################ GLOBALS -VERSION='$Version: 1.2 $' # -V +VERSION='$Version: 1.4 $' # -V pgm="${0##*/}" # Program basename @@ -576,8 +576,8 @@ load_profile() ARGV="$ARGV -z '$( shell_escape "$EXECREGEX" )'" [ "$CUSTOM_DETAILS" ] && ARGV="$ARGV -E '$( shell_escape "$EVENT_DETAILS" )'" - [ "$EVENT_TEST" ] && - ARGV="$ARGV -t '$( shell_escape "$EVENT_TEST" )'" + [ "$CUSTOM_TEST" ] && + ARGV="$ARGV -t '$( shell_escape "$CUSTOM_TEST" )'" [ "$OUTPUT" ] && ARGV="$ARGV -o '$( shell_escape "$OUTPUT" )'" [ "$OUTPUT_CMD" ] && @@ -1057,10 +1057,6 @@ PSARGS_ACTION=$( cat <&9 ) slen = length(sprintf("%u", start)) elen = length(sprintf("%u", end)) N = elen > slen ? elen : slen - for (i = start; i <= end; i++) { - ti[i] = "\033[2m" - te[i] = "\033[22m" - } ti[line] = "\033[31m" te[line] = "\033[39m" fmt = "%s%*u %s%s\n" @@ -1353,7 +1349,7 @@ $ACTIONS } /*********************************************************/ -$PROBE${EVENT_TEST:+ /$EVENT_TEST/} /* probe ID $ID */ +$PROBE${EVENT_TEST:+ / $EVENT_TEST /} /* probe ID $ID */ {${TRACE:+ printf("<$ID>"); } Modified: stable/11/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Wed May 30 18:04:25 2018 (r334391) +++ stable/11/sys/sys/param.h Wed May 30 18:27:48 2018 (r334392) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1101515 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101516 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,