Date: Wed, 30 May 2018 18:27:48 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> 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 Message-ID: <201805301827.w4UIRmwM010620@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805301827.w4UIRmwM010620>