The branch stable/13 has been updated by mhorne:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d87ee7b97fe8177f7374e7e8c053f0614c1ddbf0
commit d87ee7b97fe8177f7374e7e8c053f0614c1ddbf0
Author: Mitchell Horne <mho...@freebsd.org>
AuthorDate: 2021-04-21 20:44:52 +0000
Commit: Mitchell Horne <mho...@freebsd.org>
CommitDate: 2021-04-29 13:21:19 +0000
pmcstat: fix the usage message for -t
A slight mix-up of the flags means this case isn't triggered when it
should be. Now, `pmcstat -s event -t 1234` will print the correct
error message.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
(cherry picked from commit c4473add1d3d588d8747cab86796d2f2d4c8847c)
---
usr.sbin/pmcstat/pmcstat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/pmcstat/pmcstat.c b/usr.sbin/pmcstat/pmcstat.c
index b7f6c5e0f63e..997005cec269 100644
--- a/usr.sbin/pmcstat/pmcstat.c
+++ b/usr.sbin/pmcstat/pmcstat.c
@@ -898,7 +898,8 @@ main(int argc, char **argv)
pmcstat_show_usage();
/* check for -t pid without a process PMC spec */
- if ((args.pa_required & FLAG_HAS_TARGET) &&
+ if ((args.pa_flags & FLAG_HAS_TARGET) &&
+ (args.pa_required & FLAG_HAS_PROCESS_PMCS) &&
(args.pa_flags & FLAG_HAS_PROCESS_PMCS) == 0)
errx(EX_USAGE,
"ERROR: option -t requires a process mode PMC to be specified."
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
