Author: mmacy
Date: Fri Jun 1 00:45:59 2018
New Revision: 334465
URL: https://svnweb.freebsd.org/changeset/base/334465
Log:
pmc: add list-events command
Added:
head/usr.sbin/pmc/cmd_pmc_list.c
- copied, changed from r334464, head/usr.sbin/pmc/pmc.c
Modified:
head/usr.sbin/pmc/Makefile (contents, props changed)
head/usr.sbin/pmc/cmd_pmc.h (contents, props changed)
head/usr.sbin/pmc/pmc.c (contents, props changed)
Modified: head/usr.sbin/pmc/Makefile
==============================================================================
--- head/usr.sbin/pmc/Makefile Fri Jun 1 00:45:53 2018 (r334464)
+++ head/usr.sbin/pmc/Makefile Fri Jun 1 00:45:59 2018 (r334465)
@@ -7,6 +7,7 @@ MAN=
LIBADD= kvm pmc m ncursesw pmcstat elf
-SRCS= pmc.c pmc_util.c cmd_pmc_stat.c
+SRCS= pmc.c pmc_util.c cmd_pmc_stat.c \
+ cmd_pmc_list.c
.include <bsd.prog.mk>
Modified: head/usr.sbin/pmc/cmd_pmc.h
==============================================================================
--- head/usr.sbin/pmc/cmd_pmc.h Fri Jun 1 00:45:53 2018 (r334464)
+++ head/usr.sbin/pmc/cmd_pmc.h Fri Jun 1 00:45:59 2018 (r334465)
@@ -42,6 +42,7 @@ typedef int (*cmd_disp_t)(int, char **);
int cmd_pmc_stat(int, char **);
int cmd_pmc_stat_system(int, char **);
+int cmd_pmc_list_events(int, char **);
int pmc_util_get_pid(struct pmcstat_args *);
void pmc_util_start_pmcs(struct pmcstat_args *);
Copied and modified: head/usr.sbin/pmc/cmd_pmc_list.c (from r334464,
head/usr.sbin/pmc/pmc.c)
==============================================================================
--- head/usr.sbin/pmc/pmc.c Fri Jun 1 00:45:53 2018 (r334464, copy
source)
+++ head/usr.sbin/pmc/cmd_pmc_list.c Fri Jun 1 00:45:59 2018
(r334465)
@@ -24,91 +24,105 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
- *
*/
-#include <sys/types.h>
-#include <sys/errno.h>
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/cpuset.h>
+#include <sys/event.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
#include <sys/sysctl.h>
-#include <stddef.h>
-#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/ttycom.h>
+#include <sys/user.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <curses.h>
#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <kvm.h>
+#include <libgen.h>
#include <limits.h>
-#include <string.h>
+#include <locale.h>
+#include <math.h>
#include <pmc.h>
#include <pmclog.h>
-#include <libpmcstat.h>
+#include <regex.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <sysexits.h>
#include <unistd.h>
#include <libpmcstat.h>
#include "cmd_pmc.h"
-int pmc_displayheight = DEFAULT_DISPLAY_HEIGHT;
-int pmc_displaywidth = DEFAULT_DISPLAY_WIDTH;
-int pmc_kq;
-struct pmcstat_args pmc_args;
-struct pmcstat_pmcs pmcstat_pmcs = LIST_HEAD_INITIALIZER(pmcstat_pmcs);
-
-struct pmcstat_image_hash_list pmcstat_image_hash[PMCSTAT_NHASH];
-
-struct pmcstat_process_hash_list pmcstat_process_hash[PMCSTAT_NHASH];
-
-struct cmd_handler {
- const char *ch_name;
- cmd_disp_t ch_fn;
+static struct option longopts[] = {
+ {"long-desc", no_argument, NULL, 'U'},
+ {"desc", no_argument, NULL, 'u'},
+ {"full", no_argument, NULL, 'f'},
+ {NULL, 0, NULL, 0}
};
-static struct cmd_handler disp_table[] = {
- {"stat", cmd_pmc_stat},
- {"stat-system", cmd_pmc_stat_system},
- {NULL, NULL}
-};
-
static void
usage(void)
{
errx(EX_USAGE,
- "\t pmc management utility\n"
- "\t stat <program> run program and print stats\n"
- "\t stat-system <program> run program and print system wide stats
for duration of execution\n"
+ "\t list events\n"
+ "\t -u, desc -- short description of event\n"
+ "\t -U, long-desc -- long description of event\n"
+ "\t -f, full -- full event details\n"
);
}
-static cmd_disp_t
-disp_lookup(char *name)
-{
- struct cmd_handler *hnd;
-
- for (hnd = disp_table; hnd->ch_name != NULL; hnd++)
- if (strcmp(hnd->ch_name, name) == 0)
- return (hnd->ch_fn);
- return (NULL);
-}
-
int
-main(int argc, char **argv)
+cmd_pmc_list_events(int argc, char **argv)
{
- cmd_disp_t disp;
+ int do_long_descr, do_descr, do_full;
+ int option;
- pmc_args.pa_printfile = stderr;
- STAILQ_INIT(&pmc_args.pa_events);
- SLIST_INIT(&pmc_args.pa_targets);
- if (argc == 1)
+ do_long_descr = do_descr = do_full = 0;
+ while ((option = getopt_long(argc, argv, "Uuf", longopts, NULL)) != -1)
{
+ switch (option) {
+ case 'U':
+ do_long_descr = 1;
+ break;
+ case 'u':
+ do_descr = 1;
+ break;
+ case 'f':
+ do_full = 1;
+ break;
+ case '?':
+ default:
+ usage();
+ }
+ }
+ argc -= optind;
+ argv += optind;
+ if ((do_long_descr | do_descr | do_full) && argc == 0) {
+ warnx("event or event substring required when option
provided\n");
usage();
- if ((disp = disp_lookup(argv[1])) == NULL)
- usage();
- argc--;
- argv++;
+ }
+ if (do_full)
+ pmc_pmu_print_counter_full(argc ? argv[0] : NULL);
+ else if (do_long_descr)
+ pmc_pmu_print_counter_desc_long(argv[0]);
+ else if (do_descr)
+ pmc_pmu_print_counter_desc(argv[0]);
+ else
+ pmc_pmu_print_counters(argv[0]);
- /* Allocate a kqueue */
- if ((pmc_kq = kqueue()) < 0)
- err(EX_OSERR, "ERROR: Cannot allocate kqueue");
- if (pmc_init() < 0)
- err(EX_UNAVAILABLE,
- "ERROR: Initialization of the pmc(3) library failed"
- );
- return (disp(argc, argv));
+ return (0);
}
Modified: head/usr.sbin/pmc/pmc.c
==============================================================================
--- head/usr.sbin/pmc/pmc.c Fri Jun 1 00:45:53 2018 (r334464)
+++ head/usr.sbin/pmc/pmc.c Fri Jun 1 00:45:59 2018 (r334465)
@@ -64,6 +64,7 @@ struct cmd_handler {
static struct cmd_handler disp_table[] = {
{"stat", cmd_pmc_stat},
{"stat-system", cmd_pmc_stat_system},
+ {"list-events", cmd_pmc_list_events},
{NULL, NULL}
};
@@ -73,7 +74,8 @@ usage(void)
errx(EX_USAGE,
"\t pmc management utility\n"
"\t stat <program> run program and print stats\n"
- "\t stat-system <program> run program and print system wide stats
for duration of execution\n"
+ "\t stat-system <program> run program and print system wide
stats for duration of execution\n"
+ "\t list-events list PMC events available on host\n"
);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
