svn commit: r288495 - stable/10/usr.sbin/pmcstat

[Eric van Gyzen]

Author: vangyzen
Date: Fri Oct  2 14:11:44 2015
New Revision: 288495
URL: https://svnweb.freebsd.org/changeset/base/288495

Log:
  MFC r280793
  
  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.
  
  Sponsored by:	Dell Inc.

Modified:
  stable/10/usr.sbin/pmcstat/pmcstat.8
  stable/10/usr.sbin/pmcstat/pmcstat.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/pmcstat/pmcstat.8
==============================================================================
--- stable/10/usr.sbin/pmcstat/pmcstat.8	Fri Oct  2 13:48:32 2015	(r288494)
+++ stable/10/usr.sbin/pmcstat/pmcstat.8	Fri Oct  2 14:11:44 2015	(r288495)
@@ -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
@@ -302,6 +302,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: stable/10/usr.sbin/pmcstat/pmcstat.c
==============================================================================
--- stable/10/usr.sbin/pmcstat/pmcstat.c	Fri Oct  2 13:48:32 2015	(r288494)
+++ stable/10/usr.sbin/pmcstat/pmcstat.c	Fri Oct  2 14:11:44 2015	(r288495)
@@ -938,7 +938,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");