initial population

4 files changed, 449 insertions, 0 deletions

diff --git a/usr.bin/time/ext.h b/usr.bin/time/ext.h
new file mode 100644
index 0000000..6626a29
--- /dev/null
+++ b/usr.bin/time/ext.h
@@ -0,0 +1,5 @@
+/*	$NetBSD: ext.h,v 1.3 2017/07/15 14:34:08 christos Exp $	*/
+
+/* borrowed from ../../bin/csh/extern.h */
+void prusage1(FILE *, const char *fmt, struct rusage *, struct rusage *,
+    struct timespec *, struct timespec *);
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
new file mode 100644
index 0000000..3f42310
--- /dev/null
+++ b/usr.bin/time/time.1
@@ -0,0 +1,220 @@
+.\"	$NetBSD: time.1,v 1.28 2017/07/15 14:40:36 wiz Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"	The Regents of the University of California.  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.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+.\"
+.\"     @(#)time.1	8.1 (Berkeley) 6/6/93
+.\"
+.Dd July 15, 2017
+.Dt TIME 1
+.Os
+.Sh NAME
+.Nm time
+.Nd time command execution
+.Sh SYNOPSIS
+.Nm
+.Op Fl clp
+.Op Fl f Ar fmt
+.Ar command
+.Op Ar argument ...
+.Sh DESCRIPTION
+The
+.Nm
+utility
+executes and
+times
+.Ar command .
+After the command finishes,
+.Nm
+writes the total elapsed time (wall clock time),
+.Pq Dq real ,
+the CPU time spent executing
+.Ar command
+at user level
+.Pq Dq user ,
+and the CPU time spent executing in the operating system kernel
+.Pq Dq sys ,
+to the standard error stream.
+Times are reported in seconds.
+.Pp
+Available options:
+.Bl -tag -width Ds
+.It Fl c
+Displays information in the format used by default the
+.Nm
+builtin of
+.Xr csh 1
+uses (%Uu %Ss %E %P %X+%Dk %I+%Oio %Fpf+%Ww).
+.It Fl f
+Specify a time format using the
+.Xr csh 1
+.Nm
+builtin syntax.
+The following sequences may be used in the format string:
+.Pp
+.Bl -tag -width 4n -compact
+.It \&%U
+The time the process spent in user mode in cpu seconds.
+.It \&%S
+The time the process spent in kernel mode in cpu seconds.
+.It \&%E
+The elapsed (wall clock) time in seconds.
+.It \&%P
+The CPU percentage computed as (%U + %S) / %E.
+.It \&%W
+Number of times the process was swapped.
+.It \&%X
+The average amount in (shared) text space used in Kbytes.
+.It \&%D
+The average amount in (unshared) data/stack space used in Kbytes.
+.It \&%K
+The total space used (%X + %D) in Kbytes.
+.It \&%M
+The maximum memory the process had in use at any time in Kbytes.
+.It \&%F
+The number of major page faults (page needed to be brought from disk).
+.It \&%R
+The number of minor page faults.
+.It \&%I
+The number of input operations.
+.It \&%O
+The number of output operations.
+.It \&%r
+The number of socket messages received.
+.It \&%s
+The number of socket messages sent.
+.It \&%k
+The number of signals received.
+.It \&%w
+The number of voluntary context switches (waits).
+.It \&%c
+The number of involuntary context switches.
+.El
+.It Fl l
+Lists resource utilization information.
+The contents of the
+.Ar command
+process's
+.Em rusage
+structure are printed; see below.
+.It Fl p
+The output is formatted as specified by
+.St -p1003.2-92 .
+.El
+.Pp
+Some shells, such as
+.Xr csh 1
+and
+.Xr ksh 1 ,
+have their own and syntactically different built-in version of
+.Nm .
+The utility described here
+is available as
+.Pa /usr/bin/time
+to users of these shells.
+.Ss Resource Utilization
+If the
+.Fl l
+option is given, the following resource usage
+information is displayed
+in addition to the timing information:
+.Bl -item -offset indent -compact
+.It
+maximum resident set size
+.It
+average shared memory size
+.It
+average unshared data size
+.It
+average unshared stack size
+.It
+page reclaims
+.It
+page faults
+.It
+swaps
+.It
+block input operations
+.It
+block output operations
+.It
+messages sent
+.It
+messages received
+.It
+signals received
+.It
+voluntary context switches
+.It
+involuntary context switches
+.El
+Resource usage is the total for the execution of
+.Ar command
+and any child processes it spawns, as per
+.Xr wait4 2 .
+.Sh FILES
+.Bl -tag -width Xsys/resource.hX -compact
+.It Aq sys/resource.h
+.El
+.Sh EXIT STATUS
+The
+.Nm
+utility exits with one of the following values:
+.Bl -tag -width indent
+.It 1-125
+An error occurred in the
+.Nm
+utility.
+.It 126
+The
+.Ar command
+was found but could not be invoked.
+.It 127
+The
+.Ar command
+could not be found.
+.El
+.Pp
+Otherwise, the exit status of
+.Nm
+will be that of
+.Ar command .
+.Sh SEE ALSO
+.Xr csh 1 ,
+.Xr ksh 1 ,
+.Xr clock_gettime 2 ,
+.Xr getrusage 2 ,
+.Xr wait4 2
+.Sh STANDARDS
+The
+.Nm
+utility conforms to
+.St -p1003.2-92 .
+.Sh BUGS
+The granularity of seconds on microprocessors is crude and
+can result in times being reported for CPU usage which are too large by
+a second.
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
new file mode 100644
index 0000000..263db9a
--- /dev/null
+++ b/usr.bin/time/time.c
@@ -0,0 +1,215 @@
+/*	$NetBSD: time.c,v 1.23 2017/07/15 14:34:08 christos Exp $	*/
+
+/*
+ * Copyright (c) 1987, 1988, 1993
+ *	The Regents of the University of California.  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.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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
+__COPYRIGHT("@(#) Copyright (c) 1987, 1988, 1993\
+ The Regents of the University of California.  All rights reserved.");
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
+#endif
+__RCSID("$NetBSD: time.c,v 1.23 2017/07/15 14:34:08 christos Exp $");
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <err.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "ext.h"
+
+__dead static void	usage(void);
+static void	prl(long, const char *);
+static void	prts(const char *, const char *, const struct timespec *,
+    const char *);
+static void	prtv(const char *, const char *, const struct timeval *,
+    const char *);
+
+int
+main(int argc, char ** volatile argv)
+{
+	int pid;
+	int ch, status;
+	int volatile portableflag;
+	int volatile lflag;
+	const char *decpt;
+	const char *fmt;
+	const struct lconv *lconv;
+	struct timespec before, after;
+	struct rusage ru;
+
+	(void)setlocale(LC_ALL, "");
+
+	lflag = portableflag = 0;
+	fmt = NULL;
+	while ((ch = getopt(argc, argv, "cf:lp")) != -1) {
+		switch (ch) {
+		case 'f':
+			fmt = optarg;
+			portableflag = 0;
+			lflag = 0;
+			break;
+		case 'c':
+			fmt = "%Uu %Ss %E %P %X+%Dk %I+%Oio %Fpf+%Ww";
+			portableflag = 0;
+			lflag = 0;
+			break;
+		case 'p':
+			portableflag = 1;
+			fmt = NULL;
+			lflag = 0;
+			break;
+		case 'l':
+			lflag = 1;
+			portableflag = 0;
+			fmt = NULL;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 1)
+		usage();
+
+	(void)clock_gettime(CLOCK_MONOTONIC, &before);
+	switch(pid = vfork()) {
+	case -1:			/* error */
+		err(EXIT_FAILURE, "Vfork failed");
+		/* NOTREACHED */
+	case 0:				/* child */
+		/* LINTED will return only on failure */
+		execvp(*argv, argv);
+		err((errno == ENOENT) ? 127 : 126, "Can't exec `%s'", *argv);
+		/* NOTREACHED */
+	}
+
+	/* parent */
+	(void)signal(SIGINT, SIG_IGN);
+	(void)signal(SIGQUIT, SIG_IGN);
+	if ((pid = wait4(pid, &status, 0, &ru)) == -1)
+		err(EXIT_FAILURE, "wait4 %d failed", pid);
+	(void)clock_gettime(CLOCK_MONOTONIC, &after);
+	if (!WIFEXITED(status))
+		warnx("Command terminated abnormally.");
+	timespecsub(&after, &before, &after);
+
+	if ((lconv = localeconv()) == NULL ||
+	    (decpt = lconv->decimal_point) == NULL)
+		decpt = ".";
+
+	if (fmt) {
+		static struct rusage null_ru;
+		before.tv_sec = 0;
+		before.tv_nsec = 0;
+		prusage1(stderr, fmt, &null_ru, &ru, &after, &before);
+	} else if (portableflag) {
+		prts("real ", decpt, &after, "\n");
+		prtv("user ", decpt, &ru.ru_utime, "\n");
+		prtv("sys  ", decpt, &ru.ru_stime, "\n");
+	} else {
+		prts("", decpt, &after, " real ");
+		prtv("", decpt, &ru.ru_utime, " user ");
+		prtv("", decpt, &ru.ru_stime, " sys\n");
+	}
+
+	if (lflag) {
+		int hz = (int)sysconf(_SC_CLK_TCK);
+		unsigned long long ticks;
+#define SCALE(x) (long)(ticks ? x / ticks : 0)
+
+		ticks = hz * (ru.ru_utime.tv_sec + ru.ru_stime.tv_sec) +
+		    hz * (ru.ru_utime.tv_usec + ru.ru_stime.tv_usec) / 1000000;
+		prl(ru.ru_maxrss, "maximum resident set size");
+		prl(SCALE(ru.ru_ixrss), "average shared memory size");
+		prl(SCALE(ru.ru_idrss), "average unshared data size");
+		prl(SCALE(ru.ru_isrss), "average unshared stack size");
+		prl(ru.ru_minflt, "page reclaims");
+		prl(ru.ru_majflt, "page faults");
+		prl(ru.ru_nswap, "swaps");
+		prl(ru.ru_inblock, "block input operations");
+		prl(ru.ru_oublock, "block output operations");
+		prl(ru.ru_msgsnd, "messages sent");
+		prl(ru.ru_msgrcv, "messages received");
+		prl(ru.ru_nsignals, "signals received");
+		prl(ru.ru_nvcsw, "voluntary context switches");
+		prl(ru.ru_nivcsw, "involuntary context switches");
+	}
+
+	return (WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE);
+}
+
+static void
+usage(void)
+{
+
+	(void)fprintf(stderr, "Usage: %s [-clp] [-f <fmt>] utility [argument ...]\n",
+	    getprogname());
+	exit(EXIT_FAILURE);
+}
+
+static void
+prl(long val, const char *expn)
+{
+
+	(void)fprintf(stderr, "%10ld  %s\n", val, expn);
+}
+
+static void
+prts(const char *pre, const char *decpt, const struct timespec *ts,
+    const char *post)
+{
+
+	(void)fprintf(stderr, "%s%9lld%s%02ld%s", pre, (long long)ts->tv_sec,
+	    decpt, (long)ts->tv_nsec / 10000000, post);
+}
+
+static void
+prtv(const char *pre, const char *decpt, const struct timeval *tv,
+    const char *post)
+{
+
+	(void)fprintf(stderr, "%s%9lld%s%02ld%s", pre, (long long)tv->tv_sec,
+	    decpt, (long)tv->tv_usec / 10000, post);
+}
diff --git a/usr.bin/time/xtime.c b/usr.bin/time/xtime.c
new file mode 100644
index 0000000..b685d2d
--- /dev/null
+++ b/usr.bin/time/xtime.c
@@ -0,0 +1,9 @@
+/*	$NetBSD: xtime.c,v 1.1 2007/02/24 21:30:27 matt Exp $	*/
+
+
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include "ext.h"
+#include "csh/time.c"