Index: head/usr.bin/time/time.1 =================================================================== --- head/usr.bin/time/time.1 (revision 37912) +++ head/usr.bin/time/time.1 (revision 37913) @@ -1,130 +1,107 @@ .\" 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. All advertising materials mentioning features or use of this software .\" must display the following acknowledgement: .\" This product includes software developed by the University of .\" California, Berkeley and its contributors. .\" 4. 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 June 6, 1993 .Dt TIME 1 .Os BSD 4 .Sh NAME .Nm time .Nd time command execution .Sh SYNOPSIS .Nm -.Op Fl l -.Op Fl a +.Op Fl al .Op Fl o Ar file .Ar command .Sh DESCRIPTION The .Nm utility executes and times .Ar command by initiating a timer and passing the .Ar command to the shell. After the .Ar command finishes, .Nm writes to the standard error stream, (in seconds): the total time elapsed, time consumed by system overhead, and the time used to execute the .Ar command process. .Pp Available options: .Bl -tag -width Ds -.It Fl l -The contents of the -.Em rusage -structure are printed as well. .It Fl a If the .Fl o flag is used, append to the specified file rather than overwriting it. Otherwise, this option has no effect. +.It Fl l +The contents of the +.Em rusage +structure are printed as well. .It Fl o Ar file Write the output to .Ar file instead of stderr. If .Ar file exists and the .Fl a flag is not specified, the file will be overwritten. .El -.Sh NOTES .Pp The .Xr csh 1 has its own and syntactically different builtin version of .Nm time . The command described here is available as .Pa /usr/bin/time to .Xr csh users. -The output of -.Nm -can be directed to standard output by specifying -.Do -- -.Dc -as the argument to the -.Fl a -or -.Fl o -option. -.Pp -The -.Fl a -and -.Fl o -options are mutually exclusive. -.Sh BUGS -The granularity of seconds on micro processors is crude and -can result in times being reported for CPU usage which are too large by -a second. .Sh SEE ALSO .Xr csh 1 , .Xr getrusage 2 , .Xr wait 2 .Sh HISTORY A .Nm command appeared in .At v6 . Index: head/usr.bin/time/time.c =================================================================== --- head/usr.bin/time/time.c (revision 37912) +++ head/usr.bin/time/time.c (revision 37913) @@ -1,205 +1,202 @@ /* * 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. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. 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. */ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1987, 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: time.c,v 1.8 1998/07/27 16:08:58 des Exp $"; + "$Id: time.c,v 1.9 1998/07/27 16:54:05 des Exp $"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include -#include #include static int getstathz __P((void)); static void usage __P((void)); int main(argc, argv) int argc; char **argv; { extern char *optarg; extern int optind; register int pid; - int ch, status, lflag, aflag = 0; + int aflag, ch, lflag, status; struct timeval before, after; struct rusage ru; FILE *out = stderr; char *ofn = NULL; - lflag = 0; - while ((ch = getopt(argc, argv, "lao:")) != -1) + aflag = lflag = 0; + while ((ch = getopt(argc, argv, "alo:")) != -1) switch((char)ch) { case 'a': aflag = 1; break; - case 'o': - ofn = optarg; - break; case 'l': lflag = 1; break; + case 'o': + ofn = optarg; + break; case '?': default: usage(); } if (!(argc -= optind)) exit(0); argv += optind; if (ofn) { - if (strcmp(ofn, "-") == 0) - out = stdout; - else - if ((out = fopen(ofn, aflag?"a":"w")) == NULL) - err(EX_IOERR, ofn); + if ((out = fopen(ofn, aflag ? "a" : "w")) == NULL) + err(1, "%s", ofn); + setvbuf(out, (char *)NULL, _IONBF, (size_t)0); } gettimeofday(&before, (struct timezone *)NULL); switch(pid = vfork()) { case -1: /* error */ err(1, "time"); /* NOTREACHED */ case 0: /* child */ execvp(*argv, argv); warn("%s", *argv); _exit(1); /* NOTREACHED */ } /* parent */ (void)signal(SIGINT, SIG_IGN); (void)signal(SIGQUIT, SIG_IGN); while (wait3(&status, 0, &ru) != pid); /* XXX use waitpid */ gettimeofday(&after, (struct timezone *)NULL); if (status&0377) warnx("command terminated abnormally"); after.tv_sec -= before.tv_sec; after.tv_usec -= before.tv_usec; if (after.tv_usec < 0) after.tv_sec--, after.tv_usec += 1000000; fprintf(out, "%9ld.%02ld real ", after.tv_sec, after.tv_usec/10000); fprintf(out, "%9ld.%02ld user ", ru.ru_utime.tv_sec, ru.ru_utime.tv_usec/10000); fprintf(out, "%9ld.%02ld sys\n", ru.ru_stime.tv_sec, ru.ru_stime.tv_usec/10000); if (lflag) { int hz = getstathz(); u_long ticks; ticks = hz * (ru.ru_utime.tv_sec + ru.ru_stime.tv_sec) + hz * (ru.ru_utime.tv_usec + ru.ru_stime.tv_usec) / 1000000; /* * If our round-off on the tick calculation still puts us at 0, * then always assume at least one tick. */ if (ticks == 0) ticks = 1; fprintf(out, "%10ld %s\n", ru.ru_maxrss, "maximum resident set size"); fprintf(out, "%10ld %s\n", ru.ru_ixrss / ticks, "average shared memory size"); fprintf(out, "%10ld %s\n", ru.ru_idrss / ticks, "average unshared data size"); fprintf(out, "%10ld %s\n", ru.ru_isrss / ticks, "average unshared stack size"); fprintf(out, "%10ld %s\n", ru.ru_minflt, "page reclaims"); fprintf(out, "%10ld %s\n", ru.ru_majflt, "page faults"); fprintf(out, "%10ld %s\n", ru.ru_nswap, "swaps"); fprintf(out, "%10ld %s\n", ru.ru_inblock, "block input operations"); fprintf(out, "%10ld %s\n", ru.ru_oublock, "block output operations"); fprintf(out, "%10ld %s\n", ru.ru_msgsnd, "messages sent"); fprintf(out, "%10ld %s\n", ru.ru_msgrcv, "messages received"); fprintf(out, "%10ld %s\n", ru.ru_nsignals, "signals received"); fprintf(out, "%10ld %s\n", ru.ru_nvcsw, "voluntary context switches"); fprintf(out, "%10ld %s\n", ru.ru_nivcsw, "involuntary context switches"); } exit (WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE); } static void usage() { - fprintf(stderr, "usage: time [-l] [-a] [-o file] command\n"); - exit(EX_USAGE); + fprintf(stderr, "usage: time [-al] [-o file] command\n"); + exit(1); } /* * Return the frequency of the kernel's statistics clock. */ static int getstathz() { struct clockinfo clockrate; int mib[2]; size_t size; mib[0] = CTL_KERN; mib[1] = KERN_CLOCKRATE; size = sizeof clockrate; if (sysctl(mib, 2, &clockrate, &size, NULL, 0) == -1) err(1, "sysctl kern.clockrate"); return clockrate.stathz; }