svn commit: r280793 - head/usr.sbin/pmcstat

[Eric van Gyzen]

Author: vangyzen
Date: Sat Mar 28 21:28:22 2015
New Revision: 280793
URL: https://svnweb.freebsd.org/changeset/base/280793

Log:
  pmcstat.8: fix -a flag description; improve -m flag to match
  
  The -a flag reads a file saved by -O, not -o.
  
  The -m flag requires the -R flag.  Copy that paragraph from -a.
  
  Reviewed by:	adrian
  Approved by:	kib (mentor)
  MFC after:	1 week
  Sponsored by:	Dell Inc

Modified:
  head/usr.sbin/pmcstat/pmcstat.8
  head/usr.sbin/pmcstat/pmcstat.c

Modified: head/usr.sbin/pmcstat/pmcstat.8
==============================================================================
--- head/usr.sbin/pmcstat/pmcstat.8	Sat Mar 28 21:21:40 2015	(r280792)
+++ head/usr.sbin/pmcstat/pmcstat.8	Sat Mar 28 21:28:22 2015	(r280793)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Oct 27, 2014
+.Dd March 27, 2015
 .Dt PMCSTAT 8
 .Os
 .Sh NAME
@@ -236,7 +236,7 @@ This option requires the
 .Fl R
 option to read in samples that were previously collected and
 saved with the
-.Fl o
+.Fl O
 option.
 .It Fl c Ar cpu-spec
 Set the cpus for subsequent system mode PMCs specified on the
@@ -301,6 +301,12 @@ is a
 this information is sent to the output file specified by the
 .Fl o
 option.
+This option requires the
+.Fl R
+option to read in samples that were previously collected and
+saved with the
+.Fl O
+option.
 .It Fl n Ar rate
 Set the default sampling rate for subsequent sampling mode
 PMCs specified on the command line.

Modified: head/usr.sbin/pmcstat/pmcstat.c
==============================================================================
--- head/usr.sbin/pmcstat/pmcstat.c	Sat Mar 28 21:21:40 2015	(r280792)
+++ head/usr.sbin/pmcstat/pmcstat.c	Sat Mar 28 21:28:22 2015	(r280793)
@@ -940,7 +940,7 @@ main(int argc, char **argv)
 		errx(EX_USAGE, "ERROR: options -T and -l are mutually "
 		    "exclusive.");
 
-	/* -m option is allowed with -R only. */
+	/* -a and -m require -R */
 	if (args.pa_flags & FLAG_DO_ANNOTATE && args.pa_inputpath == NULL)
 		errx(EX_USAGE, "ERROR: option %s requires an input file",
 		    args.pa_plugin == PMCSTAT_PL_ANNOTATE ? "-m" : "-a");