 @@ -1,14 +1,14 @@
-.\"	$NetBSD: tprof.8,v 1.26 2023/04/17 07:13:35 msaitoh Exp $
+.\"	$NetBSD: tprof.8,v 1.27 2023/04/17 08:37:24 msaitoh Exp $
 .\"
 .\" Copyright (c)2011 YAMAMOTO Takashi,
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 @@ -59,48 +59,52 @@ The
 utility accepts the following options.
 The first argument,
 .Ar op ,
 specifies the action to take.
 Valid actions are:
 .Bl -tag -width offline -offset indent
 .It list
 Display the following information:
 .Bl -bullet -compact
 .It
 a list of performance counter events available on the system
 .It
 the maximum number of counters that can be used simultaneously
 .It
 the default counter for monitor and top command
 .El
 .It monitor Xo
-.Fl e
+.Op Fl e Ar name[:option][,scale]
 .Ar name[:option][,scale]
 .Op Fl e Ar ...
 .Op Fl o Ar outfile
 .Ar command
 .Xc
 Monitor the execution of command
 .Ar command .
 .Ar name
 specifies the name of the event to count; it must be taken from the list of
 available events.
 .Ar option
 specifies the source of the event; it must be a combination of
 .Ar u
 (userland) and
 .Ar k
 (kernel). If omitted, it is assumed that both are specified.
 Multiple
 .Fl e
 arguments can be specified.
 If none of the
 .Fl e
 arguments are speficied, the CPU's default counter is used.
 The collected samples are written into the file
 .Ar scale
 specifies the ratio of the speed to the cycle counter, or the counter until
 overflow.
 The counter reset value on overflow used for profiling is calculated from the
 speed of the cycle counter by default, but for some events this value may be
 too large (counter increasing too slowly) to be sufficient for profiling.
 For example, to specify an event that increases about 1000 times slower than
 the cycle counter, specify
 .Dq Pa -e event,1000 .
 Also, if
 .Dq Pa -e event,=200
 is specified, profiling is performed every time the counter is increased by 200.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tprof.c,v 1.20 2022/12/26 08:00:13 ryo Exp $	*/
+/*	$NetBSD: tprof.c,v 1.21 2023/04/17 08:37:24 msaitoh Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -47,27 +47,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: tprof.c,v 1.20 2022/12/26 08:00:13 ryo Exp $");
+__RCSID("$NetBSD: tprof.c,v 1.21 2023/04/17 08:37:24 msaitoh Exp $");
 #endif /* not lint */
 #include <sys/atomic.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <dev/tprof/tprof_ioctl.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 @@ -250,27 +250,32 @@ process_stat(void *arg)
 	while (atomic_add_int_nv(done, 0) == 0) {
 		show_counters();
 		nanosleep(&ts, NULL);
 		if (errno == EINTR)	/* interrupted by SIGINFO? */
 			output_delay();
+	}
 	return NULL;
+}
 static void
 tprof_list(int argc, char **argv)
+{
-	printf("%u events can be counted at the same time\n", ncounters);
+	const char *defaultevent = tprof_cycle_event_name();
 	printf("%u events can be counted at the same time.\n", ncounters);
 	if (defaultevent != NULL)
 		printf("The default counter for monitor and top command is "
 		    "\"%s\".\n", defaultevent);
 	tprof_event_list();
+}
 int
 tprof_parse_event(tprof_param_t *param, const char *str, uint32_t flags,
     const char **eventnamep, char **errmsgp)
+{
 	double d;
 	uint64_t n;
 	int error = 0;
 	char *p, *event = NULL, *opt = NULL, *scale = NULL;
 	bool allow_option, allow_scale;
 	static char errmsgbuf[128];
 @@ -346,26 +351,49 @@ tprof_parse_event(tprof_param_t *param,
 			    "invalid scale: %s", scale);
 			goto done;
+		}
+	}
  done:
 	if (eventnamep != NULL)
 		*eventnamep = event;
 	if (error != 0 && errmsgp != NULL)
 		*errmsgp = errmsgbuf;
 	return error;
+}
 const char *
 tprof_cycle_event_name(void)
+{
 	const char *cycleevent;
 	switch (tprof_info.ti_ident) {
 	case TPROF_IDENT_INTEL_GENERIC:
 		cycleevent = "unhalted-core-cycles";
 		break;
 	case TPROF_IDENT_AMD_GENERIC:
 		cycleevent = "LsNotHaltedCyc";
 		break;
 	case TPROF_IDENT_ARMV8_GENERIC:
 	case TPROF_IDENT_ARMV7_GENERIC:
 		cycleevent = "CPU_CYCLES";
 		break;
 	default:
 		cycleevent = NULL;
 		break;
+	}
 	return cycleevent;
+}
 static void
 tprof_monitor_common(bool do_profile, int argc, char **argv)
+{
 	const char *outfile = "tprof.out";
 	struct tprof_stat ts;
 	tprof_param_t params[TPROF_MAXCOUNTERS];
 	pid_t pid;
 	pthread_t pt;
 	int ret, ch, i;
 	char *p, *errmsg;
 	tprof_countermask_t mask = TPROF_COUNTERMASK_ALL;
 	memset(params, 0, sizeof(params));
 @@ -394,28 +422,37 @@ tprof_monitor_common(bool do_profile, in
 			nevent++;
 			if (nevent > __arraycount(params) ||
 			    nevent > ncounters)
 				errx(EXIT_FAILURE, "Too many events. Only a"
 				    " maximum of %d counters can be used.",
 				    ncounters);
 			break;
 		default:
 			usage();
+		}
+	}
 	argc -= optind;
 	argv += optind;
-	if (argc == 0 || nevent == 0) {
+	if (argc == 0)
 		usage();
 	if (nevent == 0) {
 		const char *defaultevent = tprof_cycle_event_name();
 		if (defaultevent == NULL)
 			errx(EXIT_FAILURE, "cpu not supported");
 		tprof_event_lookup(defaultevent, &params[nevent]);
 		eventname[nevent] = defaultevent;
 		params[nevent].p_flags |= TPROF_PARAM_KERN;
 		nevent++;
+	}
 	if (do_profile) {
 		outfd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
 		if (outfd == -1) {
 			err(EXIT_FAILURE, "%s", outfile);
+		}
+	}
 	for (i = 0; i < (int)nevent; i++) {
 		params[i].p_counter = i;
 		if (do_profile)
 			params[i].p_flags |= TPROF_PARAM_PROFILE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tprof.h,v 1.4 2022/12/16 08:02:04 ryo Exp $	*/
+/*	$NetBSD: tprof.h,v 1.5 2023/04/17 08:37:24 msaitoh Exp $	*/
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Maxime Villard.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,24 +24,25 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 extern struct tprof_info tprof_info;
 extern int ncpu;
 extern int devfd;
 extern u_int ncounters;
 const char *tprof_cycle_event_name(void);
 int tprof_event_init(uint32_t);
 void tprof_event_list(void);
 void tprof_event_lookup(const char *, struct tprof_param *);
 int tprof_parse_event(tprof_param_t *, const char *, uint32_t, const char **,
     char **);
 #define TPROF_PARSE_EVENT_F_ALLOWOPTION	0x00000001
 #define TPROF_PARSE_EVENT_F_ALLOWSCALE	0x00000002
 void tprof_analyze(int, char **);
 void tprof_top(int, char **);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tprof_top.c,v 1.8 2022/12/23 19:37:06 christos Exp $	*/
+/*	$NetBSD: tprof_top.c,v 1.9 2023/04/17 08:37:24 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2022 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: tprof_top.c,v 1.8 2022/12/23 19:37:06 christos Exp $");
+__RCSID("$NetBSD: tprof_top.c,v 1.9 2023/04/17 08:37:24 msaitoh Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/rbtree.h>
 #include <sys/select.h>
 #include <sys/time.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -108,49 +108,26 @@ struct ptrarray sample_list[SAMPLE_MODE_
 static u_int sample_n_kern[SAMPLE_MODE_NUM];
 static u_int sample_n_user[SAMPLE_MODE_NUM];
 static u_int sample_event_width = 7;
 static u_int *sample_cpu_width;					/* [ncpu] */
 static uint32_t *sample_n_kern_per_cpu[SAMPLE_MODE_NUM];	/* [ncpu] */
 static uint32_t *sample_n_user_per_cpu[SAMPLE_MODE_NUM];	/* [ncpu] */
 static uint64_t *sample_n_per_event[SAMPLE_MODE_NUM];		/* [nevent] */
 static uint64_t *sample_n_per_event_cpu[SAMPLE_MODE_NUM];	/* [ncpu] */
 /* raw event counter */
 static uint64_t *counters;	/* counters[2][ncpu][nevent] */
 static u_int counters_i;
 static const char *
 cycle_event_name(void)
 	const char *cycleevent;
 	switch (tprof_info.ti_ident) {
 	case TPROF_IDENT_INTEL_GENERIC:
 		cycleevent = "unhalted-core-cycles";
 		break;
 	case TPROF_IDENT_AMD_GENERIC:
 		cycleevent = "LsNotHaltedCyc";
 		break;
 	case TPROF_IDENT_ARMV8_GENERIC:
 	case TPROF_IDENT_ARMV7_GENERIC:
 		cycleevent = "CPU_CYCLES";
 		break;
 	default:
 		cycleevent = NULL;
 		break;
 	return cycleevent;
 static void
 reset_cursor_pos(void)
+{
 	int i;
 	char *p;
 	if (nontty || term == NULL)
 		return;
 	printf("\r");
 	/* cursor_up * n */
 	if ((p = tigetstr("cuu")) != NULL) {
 @@ -968,27 +945,27 @@ tprof_top(int argc, char **argv)
 			opt_userland = 1;
 			break;
 		default:
 			tprof_top_usage();
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc != 0)
 		tprof_top_usage();
 	if (nevent == 0) {
-		const char *defaultevent = cycle_event_name();
+		const char *defaultevent = tprof_cycle_event_name();
 		if (defaultevent == NULL)
 			die_errc(EXIT_FAILURE, 0, "cpu not supported");
 		tprof_event_lookup(defaultevent, &params[nevent]);
 		eventname[nevent] = defaultevent;
 		nevent++;
+	}
 	sample_init();
 	show_counters_alloc();
 	for (i = 0; i < nevent; i++) {
 		params[i].p_counter = i;