diff options
Diffstat (limited to 'release/src/router/busybox/miscutils/time.c')
| -rw-r--r-- | release/src/router/busybox/miscutils/time.c | 737 |
1 files changed, 332 insertions, 405 deletions
diff --git a/release/src/router/busybox/miscutils/time.c b/release/src/router/busybox/miscutils/time.c index c30ef431..30298fe3 100644 --- a/release/src/router/busybox/miscutils/time.c +++ b/release/src/router/busybox/miscutils/time.c @@ -1,147 +1,85 @@ -/* `time' utility to display resource usage of processes. +/* vi: set sw=4 ts=4: */ +/* 'time' utility to display resource usage of processes. Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - + Licensed under GPL version 2, see file LICENSE in this tarball for details. +*/ /* Originally written by David Keppel <pardo@cs.washington.edu>. - Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. + Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>. Heavily modified for busybox by Erik Andersen <andersen@codepoet.org> - */ - -#include <stdlib.h> -#include <stdio.h> -#include <signal.h> -#include <errno.h> -#include <getopt.h> -#include <string.h> -#include <limits.h> -#include <unistd.h> -#include <sys/time.h> -#include <sys/types.h> /* For pid_t. */ -#include <sys/wait.h> -#include <sys/param.h> /* For getpagesize, maybe. */ - -#define TV_MSEC tv_usec / 1000 -#include <sys/resource.h> -#include "busybox.h" +*/ + +#include "libbb.h" /* Information on the resources used by a child process. */ -typedef struct -{ - int waitstatus; - struct rusage ru; - struct timeval start, elapsed; /* Wallclock time of process. */ +typedef struct { + int waitstatus; + struct rusage ru; + unsigned elapsed_ms; /* Wallclock time of process. */ } resource_t; /* msec = milliseconds = 1/1,000 (1*10e-3) second. usec = microseconds = 1/1,000,000 (1*10e-6) second. */ -#ifndef TICKS_PER_SEC -#define TICKS_PER_SEC 100 -#endif - -/* The number of milliseconds in one `tick' used by the `rusage' structure. */ -#define MSEC_PER_TICK (1000 / TICKS_PER_SEC) - -/* Return the number of clock ticks that occur in M milliseconds. */ -#define MSEC_TO_TICKS(m) ((m) / MSEC_PER_TICK) - #define UL unsigned long -static const char *const default_format = "real\t%E\nuser\t%u\nsys\t%T"; +static const char default_format[] ALIGN1 = "real\t%E\nuser\t%u\nsys\t%T"; /* The output format for the -p option .*/ -static const char *const posix_format = "real %e\nuser %U\nsys %S"; - +static const char posix_format[] ALIGN1 = "real %e\nuser %U\nsys %S"; /* Format string for printing all statistics verbosely. Keep this output to 24 lines so users on terminals can see it all.*/ -static const char *const long_format = - "\tCommand being timed: \"%C\"\n" - "\tUser time (seconds): %U\n" - "\tSystem time (seconds): %S\n" - "\tPercent of CPU this job got: %P\n" - "\tElapsed (wall clock) time (h:mm:ss or m:ss): %E\n" - "\tAverage shared text size (kbytes): %X\n" - "\tAverage unshared data size (kbytes): %D\n" - "\tAverage stack size (kbytes): %p\n" - "\tAverage total size (kbytes): %K\n" - "\tMaximum resident set size (kbytes): %M\n" - "\tAverage resident set size (kbytes): %t\n" - "\tMajor (requiring I/O) page faults: %F\n" - "\tMinor (reclaiming a frame) page faults: %R\n" - "\tVoluntary context switches: %w\n" - "\tInvoluntary context switches: %c\n" - "\tSwaps: %W\n" - "\tFile system inputs: %I\n" - "\tFile system outputs: %O\n" - "\tSocket messages sent: %s\n" - "\tSocket messages received: %r\n" - "\tSignals delivered: %k\n" - "\tPage size (bytes): %Z\n" - "\tExit status: %x"; - - - /* Wait for and fill in data on child process PID. +static const char long_format[] ALIGN1 = + "\tCommand being timed: \"%C\"\n" + "\tUser time (seconds): %U\n" + "\tSystem time (seconds): %S\n" + "\tPercent of CPU this job got: %P\n" + "\tElapsed (wall clock) time (h:mm:ss or m:ss): %E\n" + "\tAverage shared text size (kbytes): %X\n" + "\tAverage unshared data size (kbytes): %D\n" + "\tAverage stack size (kbytes): %p\n" + "\tAverage total size (kbytes): %K\n" + "\tMaximum resident set size (kbytes): %M\n" + "\tAverage resident set size (kbytes): %t\n" + "\tMajor (requiring I/O) page faults: %F\n" + "\tMinor (reclaiming a frame) page faults: %R\n" + "\tVoluntary context switches: %w\n" + "\tInvoluntary context switches: %c\n" + "\tSwaps: %W\n" + "\tFile system inputs: %I\n" + "\tFile system outputs: %O\n" + "\tSocket messages sent: %s\n" + "\tSocket messages received: %r\n" + "\tSignals delivered: %k\n" + "\tPage size (bytes): %Z\n" + "\tExit status: %x"; + +/* Wait for and fill in data on child process PID. Return 0 on error, 1 if ok. */ - /* pid_t is short on BSDI, so don't try to promote it. */ -static int resuse_end (pid_t pid, resource_t *resp) +static void resuse_end(pid_t pid, resource_t *resp) { - int status; - - pid_t caught; - - /* Ignore signals, but don't ignore the children. When wait3 - returns the child process, set the time the command finished. */ - while ((caught = wait3 (&status, 0, &resp->ru)) != pid) - { - if (caught == -1) - return 0; - } - - gettimeofday (&resp->elapsed, (struct timezone *) 0); - resp->elapsed.tv_sec -= resp->start.tv_sec; - if (resp->elapsed.tv_usec < resp->start.tv_usec) - { - /* Manually carry a one from the seconds field. */ - resp->elapsed.tv_usec += 1000000; - --resp->elapsed.tv_sec; - } - resp->elapsed.tv_usec -= resp->start.tv_usec; - - resp->waitstatus = status; - - return 1; + pid_t caught; + + /* Ignore signals, but don't ignore the children. When wait3 + returns the child process, set the time the command finished. */ + while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) { + if (caught == -1 && errno != EINTR) { + bb_perror_msg("wait"); + return; + } + } + resp->elapsed_ms = (monotonic_us() / 1000) - resp->elapsed_ms; } -/* Print ARGV to FP, with each entry in ARGV separated by FILLER. */ -static void fprintargv (FILE *fp, char *const *argv, const char *filler) +static void printargv(char *const *argv) { - char *const *av; - - av = argv; - fputs (*av, fp); - while (*++av) - { - fputs (filler, fp); - fputs (*av, fp); - } - if (ferror (fp)) - bb_error_msg_and_die("write error"); + const char *fmt = " %s" + 1; + do { + printf(fmt, *argv); + fmt = " %s"; + } while (*++argv); } /* Return the number of kilobytes corresponding to a number of pages PAGES. @@ -151,34 +89,23 @@ static void fprintargv (FILE *fp, char *const *argv, const char *filler) This is funky since the pagesize could be less than 1K. Note: Some machines express getrusage statistics in terms of K, others in terms of pages. */ - -static unsigned long ptok (unsigned long pages) +static unsigned long ptok(const unsigned pagesize, const unsigned long pages) { - static unsigned long ps = 0; - unsigned long tmp; - static long size = LONG_MAX; - - /* Initialization. */ - if (ps == 0) - ps = (long) getpagesize (); - - /* Conversion. */ - if (pages > (LONG_MAX / ps)) - { /* Could overflow. */ - tmp = pages / 1024; /* Smaller first, */ - size = tmp * ps; /* then larger. */ - } - else - { /* Could underflow. */ - tmp = pages * ps; /* Larger first, */ - size = tmp / 1024; /* then smaller. */ - } - return size; + unsigned long tmp; + + /* Conversion. */ + if (pages > (LONG_MAX / pagesize)) { /* Could overflow. */ + tmp = pages / 1024; /* Smaller first, */ + return tmp * pagesize; /* then larger. */ + } + /* Could underflow. */ + tmp = pages * pagesize; /* Larger first, */ + return tmp / 1024; /* then smaller. */ } /* summarize: Report on the system use of a command. - Copy the FMT argument to FP except that `%' sequences + Print the FMT argument except that `%' sequences have special meaning, and `\n' and `\t' are translated into newline and tab, respectively, and `\\' is translated into `\'. @@ -216,287 +143,287 @@ static unsigned long ptok (unsigned long pages) to kbytes by multiplying by the page size, dividing by 1024, and dividing by elapsed real time. - FP is the stream to print to. FMT is the format string, interpreted as described above. COMMAND is the command and args that are being summarized. RESP is resource information on the command. */ -static void summarize (FILE *fp, const char *fmt, char **command, resource_t *resp) +#ifndef TICKS_PER_SEC +#define TICKS_PER_SEC 100 +#endif + +static void summarize(const char *fmt, char **command, resource_t *resp) { - unsigned long r; /* Elapsed real milliseconds. */ - unsigned long v; /* Elapsed virtual (CPU) milliseconds. */ - - if (WIFSTOPPED (resp->waitstatus)) - fprintf (fp, "Command stopped by signal %d\n", WSTOPSIG (resp->waitstatus)); - else if (WIFSIGNALED (resp->waitstatus)) - fprintf (fp, "Command terminated by signal %d\n", WTERMSIG (resp->waitstatus)); - else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus)) - fprintf (fp, "Command exited with non-zero status %d\n", WEXITSTATUS (resp->waitstatus)); - - /* Convert all times to milliseconds. Occasionally, one of these values - comes out as zero. Dividing by zero causes problems, so we first - check the time value. If it is zero, then we take `evasive action' - instead of calculating a value. */ - - r = resp->elapsed.tv_sec * 1000 + resp->elapsed.tv_usec / 1000; - - v = resp->ru.ru_utime.tv_sec * 1000 + resp->ru.ru_utime.TV_MSEC + - resp->ru.ru_stime.tv_sec * 1000 + resp->ru.ru_stime.TV_MSEC; - - while (*fmt) - { - switch (*fmt) - { - case '%': - switch (*++fmt) - { - case '%': /* Literal '%'. */ - putc ('%', fp); - break; - case 'C': /* The command that got timed. */ - fprintargv (fp, command, " "); - break; - case 'D': /* Average unshared data size. */ - fprintf (fp, "%lu", - MSEC_TO_TICKS (v) == 0 ? 0 : - ptok ((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS (v) + - ptok ((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS (v)); - break; - case 'E': /* Elapsed real (wall clock) time. */ - if (resp->elapsed.tv_sec >= 3600) /* One hour -> h:m:s. */ - fprintf (fp, "%ldh %ldm %02lds", - resp->elapsed.tv_sec / 3600, - (resp->elapsed.tv_sec % 3600) / 60, - resp->elapsed.tv_sec % 60); - else - fprintf (fp, "%ldm %ld.%02lds", /* -> m:s. */ - resp->elapsed.tv_sec / 60, - resp->elapsed.tv_sec % 60, - resp->elapsed.tv_usec / 10000); - break; - case 'F': /* Major page faults. */ - fprintf (fp, "%ld", resp->ru.ru_majflt); - break; - case 'I': /* Inputs. */ - fprintf (fp, "%ld", resp->ru.ru_inblock); - break; - case 'K': /* Average mem usage == data+stack+text. */ - fprintf (fp, "%lu", - MSEC_TO_TICKS (v) == 0 ? 0 : - ptok ((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS (v) + - ptok ((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS (v) + - ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); - break; - case 'M': /* Maximum resident set size. */ - fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss)); - break; - case 'O': /* Outputs. */ - fprintf (fp, "%ld", resp->ru.ru_oublock); - break; - case 'P': /* Percent of CPU this job got. */ - /* % cpu is (total cpu time)/(elapsed time). */ - if (r > 0) - fprintf (fp, "%lu%%", (v * 100 / r)); - else - fprintf (fp, "?%%"); - break; - case 'R': /* Minor page faults (reclaims). */ - fprintf (fp, "%ld", resp->ru.ru_minflt); - break; - case 'S': /* System time. */ - fprintf (fp, "%ld.%02ld", - resp->ru.ru_stime.tv_sec, - resp->ru.ru_stime.TV_MSEC / 10); - break; - case 'T': /* System time. */ - if (resp->ru.ru_stime.tv_sec >= 3600) /* One hour -> h:m:s. */ - fprintf (fp, "%ldh %ldm %02lds", - resp->ru.ru_stime.tv_sec / 3600, - (resp->ru.ru_stime.tv_sec % 3600) / 60, - resp->ru.ru_stime.tv_sec % 60); - else - fprintf (fp, "%ldm %ld.%02lds", /* -> m:s. */ - resp->ru.ru_stime.tv_sec / 60, - resp->ru.ru_stime.tv_sec % 60, - resp->ru.ru_stime.tv_usec / 10000); - break; - case 'U': /* User time. */ - fprintf (fp, "%ld.%02ld", - resp->ru.ru_utime.tv_sec, - resp->ru.ru_utime.TV_MSEC / 10); - break; - case 'u': /* User time. */ - if (resp->ru.ru_utime.tv_sec >= 3600) /* One hour -> h:m:s. */ - fprintf (fp, "%ldh %ldm %02lds", - resp->ru.ru_utime.tv_sec / 3600, - (resp->ru.ru_utime.tv_sec % 3600) / 60, - resp->ru.ru_utime.tv_sec % 60); - else - fprintf (fp, "%ldm %ld.%02lds", /* -> m:s. */ - resp->ru.ru_utime.tv_sec / 60, - resp->ru.ru_utime.tv_sec % 60, - resp->ru.ru_utime.tv_usec / 10000); - break; - case 'W': /* Times swapped out. */ - fprintf (fp, "%ld", resp->ru.ru_nswap); - break; - case 'X': /* Average shared text size. */ - fprintf (fp, "%lu", - MSEC_TO_TICKS (v) == 0 ? 0 : - ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v)); - break; - case 'Z': /* Page size. */ - fprintf (fp, "%d", getpagesize ()); - break; - case 'c': /* Involuntary context switches. */ - fprintf (fp, "%ld", resp->ru.ru_nivcsw); - break; - case 'e': /* Elapsed real time in seconds. */ - fprintf (fp, "%ld.%02ld", - resp->elapsed.tv_sec, - resp->elapsed.tv_usec / 10000); - break; - case 'k': /* Signals delivered. */ - fprintf (fp, "%ld", resp->ru.ru_nsignals); - break; - case 'p': /* Average stack segment. */ - fprintf (fp, "%lu", - MSEC_TO_TICKS (v) == 0 ? 0 : - ptok ((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS (v)); - break; - case 'r': /* Incoming socket messages received. */ - fprintf (fp, "%ld", resp->ru.ru_msgrcv); - break; - case 's': /* Outgoing socket messages sent. */ - fprintf (fp, "%ld", resp->ru.ru_msgsnd); - break; - case 't': /* Average resident set size. */ - fprintf (fp, "%lu", - MSEC_TO_TICKS (v) == 0 ? 0 : - ptok ((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS (v)); - break; - case 'w': /* Voluntary context switches. */ - fprintf (fp, "%ld", resp->ru.ru_nvcsw); - break; - case 'x': /* Exit status. */ - fprintf (fp, "%d", WEXITSTATUS (resp->waitstatus)); - break; - case '\0': - putc ('?', fp); - return; - default: - putc ('?', fp); - putc (*fmt, fp); + unsigned vv_ms; /* Elapsed virtual (CPU) milliseconds */ + unsigned cpu_ticks; /* Same, in "CPU ticks" */ + unsigned pagesize = getpagesize(); + + /* Impossible: we do not use WUNTRACED flag in wait()... + if (WIFSTOPPED(resp->waitstatus)) + printf("Command stopped by signal %u\n", + WSTOPSIG(resp->waitstatus)); + else */ + if (WIFSIGNALED(resp->waitstatus)) + printf("Command terminated by signal %u\n", + WTERMSIG(resp->waitstatus)); + else if (WIFEXITED(resp->waitstatus) && WEXITSTATUS(resp->waitstatus)) + printf("Command exited with non-zero status %u\n", + WEXITSTATUS(resp->waitstatus)); + + vv_ms = (resp->ru.ru_utime.tv_sec + resp->ru.ru_stime.tv_sec) * 1000 + + (resp->ru.ru_utime.tv_usec + resp->ru.ru_stime.tv_usec) / 1000; + +#if (1000 / TICKS_PER_SEC) * TICKS_PER_SEC == 1000 + /* 1000 is exactly divisible by TICKS_PER_SEC (typical) */ + cpu_ticks = vv_ms / (1000 / TICKS_PER_SEC); +#else + cpu_ticks = vv_ms * (unsigned long long)TICKS_PER_SEC / 1000; +#endif + if (!cpu_ticks) cpu_ticks = 1; /* we divide by it, must be nonzero */ + + while (*fmt) { + /* Handle leading literal part */ + int n = strcspn(fmt, "%\\"); + if (n) { + printf("%.*s", n, fmt); + fmt += n; + continue; } - ++fmt; - break; - case '\\': /* Format escape. */ - switch (*++fmt) - { - case 't': - putc ('\t', fp); + switch (*fmt) { +#ifdef NOT_NEEDED + /* Handle literal char */ + /* Usually we optimize for size, but there is a limit + * for everything. With this we do a lot of 1-byte writes */ + default: + bb_putchar(*fmt); break; - case 'n': - putc ('\n', fp); +#endif + + case '%': + switch (*++fmt) { +#ifdef NOT_NEEDED_YET + /* Our format strings do not have these */ + /* and we do not take format str from user */ + default: + bb_putchar('%'); + /*FALLTHROUGH*/ + case '%': + if (!*fmt) goto ret; + bb_putchar(*fmt); + break; +#endif + case 'C': /* The command that got timed. */ + printargv(command); + break; + case 'D': /* Average unshared data size. */ + printf("%lu", + (ptok(pagesize, (UL) resp->ru.ru_idrss) + + ptok(pagesize, (UL) resp->ru.ru_isrss)) / cpu_ticks); + break; + case 'E': { /* Elapsed real (wall clock) time. */ + unsigned seconds = resp->elapsed_ms / 1000; + if (seconds >= 3600) /* One hour -> h:m:s. */ + printf("%uh %um %02us", + seconds / 3600, + (seconds % 3600) / 60, + seconds % 60); + else + printf("%um %u.%02us", /* -> m:s. */ + seconds / 60, + seconds % 60, + (unsigned)(resp->elapsed_ms / 10) % 100); + break; + } + case 'F': /* Major page faults. */ + printf("%lu", resp->ru.ru_majflt); + break; + case 'I': /* Inputs. */ + printf("%lu", resp->ru.ru_inblock); + break; + case 'K': /* Average mem usage == data+stack+text. */ + printf("%lu", + (ptok(pagesize, (UL) resp->ru.ru_idrss) + + ptok(pagesize, (UL) resp->ru.ru_isrss) + + ptok(pagesize, (UL) resp->ru.ru_ixrss)) / cpu_ticks); + break; + case 'M': /* Maximum resident set size. */ + printf("%lu", ptok(pagesize, (UL) resp->ru.ru_maxrss)); + break; + case 'O': /* Outputs. */ + printf("%lu", resp->ru.ru_oublock); + break; + case 'P': /* Percent of CPU this job got. */ + /* % cpu is (total cpu time)/(elapsed time). */ + if (resp->elapsed_ms > 0) + printf("%u%%", (unsigned)(vv_ms * 100 / resp->elapsed_ms)); + else + printf("?%%"); + break; + case 'R': /* Minor page faults (reclaims). */ + printf("%lu", resp->ru.ru_minflt); + break; + case 'S': /* System time. */ + printf("%u.%02u", + (unsigned)resp->ru.ru_stime.tv_sec, + (unsigned)(resp->ru.ru_stime.tv_usec / 10000)); + break; + case 'T': /* System time. */ + if (resp->ru.ru_stime.tv_sec >= 3600) /* One hour -> h:m:s. */ + printf("%uh %um %02us", + (unsigned)(resp->ru.ru_stime.tv_sec / 3600), + (unsigned)(resp->ru.ru_stime.tv_sec % 3600) / 60, + (unsigned)(resp->ru.ru_stime.tv_sec % 60)); + else + printf("%um %u.%02us", /* -> m:s. */ + (unsigned)(resp->ru.ru_stime.tv_sec / 60), + (unsigned)(resp->ru.ru_stime.tv_sec % 60), + (unsigned)(resp->ru.ru_stime.tv_usec / 10000)); + break; + case 'U': /* User time. */ + printf("%u.%02u", + (unsigned)resp->ru.ru_utime.tv_sec, + (unsigned)(resp->ru.ru_utime.tv_usec / 10000)); + break; + case 'u': /* User time. */ + if (resp->ru.ru_utime.tv_sec >= 3600) /* One hour -> h:m:s. */ + printf("%uh %um %02us", + (unsigned)(resp->ru.ru_utime.tv_sec / 3600), + (unsigned)(resp->ru.ru_utime.tv_sec % 3600) / 60, + (unsigned)(resp->ru.ru_utime.tv_sec % 60)); + else + printf("%um %u.%02us", /* -> m:s. */ + (unsigned)(resp->ru.ru_utime.tv_sec / 60), + (unsigned)(resp->ru.ru_utime.tv_sec % 60), + (unsigned)(resp->ru.ru_utime.tv_usec / 10000)); + break; + case 'W': /* Times swapped out. */ + printf("%lu", resp->ru.ru_nswap); + break; + case 'X': /* Average shared text size. */ + printf("%lu", ptok(pagesize, (UL) resp->ru.ru_ixrss) / cpu_ticks); + break; + case 'Z': /* Page size. */ + printf("%u", pagesize); + break; + case 'c': /* Involuntary context switches. */ + printf("%lu", resp->ru.ru_nivcsw); + break; + case 'e': /* Elapsed real time in seconds. */ + printf("%u.%02u", + (unsigned)resp->elapsed_ms / 1000, + (unsigned)(resp->elapsed_ms / 10) % 100); + break; + case 'k': /* Signals delivered. */ + printf("%lu", resp->ru.ru_nsignals); + break; + case 'p': /* Average stack segment. */ + printf("%lu", ptok(pagesize, (UL) resp->ru.ru_isrss) / cpu_ticks); + break; + case 'r': /* Incoming socket messages received. */ + printf("%lu", resp->ru.ru_msgrcv); + break; + case 's': /* Outgoing socket messages sent. */ + printf("%lu", resp->ru.ru_msgsnd); + break; + case 't': /* Average resident set size. */ + printf("%lu", ptok(pagesize, (UL) resp->ru.ru_idrss) / cpu_ticks); + break; + case 'w': /* Voluntary context switches. */ + printf("%lu", resp->ru.ru_nvcsw); + break; + case 'x': /* Exit status. */ + printf("%u", WEXITSTATUS(resp->waitstatus)); + break; + } break; - case '\\': - putc ('\\', fp); + +#ifdef NOT_NEEDED_YET + case '\\': /* Format escape. */ + switch (*++fmt) { + default: + bb_putchar('\\'); + /*FALLTHROUGH*/ + case '\\': + if (!*fmt) goto ret; + bb_putchar(*fmt); + break; + case 't': + bb_putchar('\t'); + break; + case 'n': + bb_putchar('\n'); + break; + } break; - default: - putc ('?', fp); - putc ('\\', fp); - putc (*fmt, fp); +#endif } ++fmt; - break; - - default: - putc (*fmt++, fp); } - - if (ferror (fp)) - bb_error_msg_and_die("write error"); - } - putc ('\n', fp); - - if (ferror (fp)) - bb_error_msg_and_die("write error"); + /* ret: */ + bb_putchar('\n'); } /* Run command CMD and return statistics on it. Put the statistics in *RESP. */ -static void run_command (char *const *cmd, resource_t *resp) +static void run_command(char *const *cmd, resource_t *resp) { - pid_t pid; /* Pid of child. */ - __sighandler_t interrupt_signal, quit_signal; - - gettimeofday (&resp->start, (struct timezone *) 0); - pid = fork (); /* Run CMD as child process. */ - if (pid < 0) - bb_error_msg_and_die("cannot fork"); - else if (pid == 0) - { /* If child. */ - /* Don't cast execvp arguments; that causes errors on some systems, - versus merely warnings if the cast is left off. */ - execvp (cmd[0], cmd); - bb_error_msg("cannot run %s", cmd[0]); - _exit (errno == ENOENT ? 127 : 126); - } - - /* Have signals kill the child but not self (if possible). */ - interrupt_signal = signal (SIGINT, SIG_IGN); - quit_signal = signal (SIGQUIT, SIG_IGN); - - if (resuse_end (pid, resp) == 0) - bb_error_msg("error waiting for child process"); - - /* Re-enable signals. */ - signal (SIGINT, interrupt_signal); - signal (SIGQUIT, quit_signal); + pid_t pid; /* Pid of child. */ + void (*interrupt_signal)(int); + void (*quit_signal)(int); + + resp->elapsed_ms = monotonic_us() / 1000; + pid = vfork(); /* Run CMD as child process. */ + if (pid < 0) + bb_perror_msg_and_die("fork"); + if (pid == 0) { /* If child. */ + /* Don't cast execvp arguments; that causes errors on some systems, + versus merely warnings if the cast is left off. */ + BB_EXECVP(cmd[0], cmd); + xfunc_error_retval = (errno == ENOENT ? 127 : 126); + bb_error_msg_and_die("cannot run %s", cmd[0]); + } + + /* Have signals kill the child but not self (if possible). */ +//TODO: just block all sigs? and reenable them in the very end in main? + interrupt_signal = signal(SIGINT, SIG_IGN); + quit_signal = signal(SIGQUIT, SIG_IGN); + + resuse_end(pid, resp); + + /* Re-enable signals. */ + signal(SIGINT, interrupt_signal); + signal(SIGQUIT, quit_signal); } -extern int time_main (int argc, char **argv) +int time_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int time_main(int argc UNUSED_PARAM, char **argv) { - int gotone; - resource_t res; - const char *output_format = default_format; - - argc--; - argv++; - /* Parse any options -- don't use getopt() here so we don't - * consume the args of our client application... */ - while (argc > 0 && **argv == '-') { - gotone = 0; - while (gotone==0 && *++(*argv)) { - switch (**argv) { - case 'v': - output_format = long_format; - break; - case 'p': - output_format = posix_format; - break; - default: - bb_show_usage(); - } - argc--; - argv++; - gotone = 1; - } - } - - if (argv == NULL || *argv == NULL) - bb_show_usage(); - - run_command (argv, &res); - summarize (stdout, output_format, argv, &res); - fflush (stdout); - - if (WIFSTOPPED (res.waitstatus)) - exit (WSTOPSIG (res.waitstatus)); - else if (WIFSIGNALED (res.waitstatus)) - exit (WTERMSIG (res.waitstatus)); - else if (WIFEXITED (res.waitstatus)) - exit (WEXITSTATUS (res.waitstatus)); - return 0; + resource_t res; + const char *output_format = default_format; + int opt; + + opt_complementary = "-1"; /* at least one arg */ + /* "+": stop on first non-option */ + opt = getopt32(argv, "+vp"); + argv += optind; + if (opt & 1) + output_format = long_format; + if (opt & 2) + output_format = posix_format; + + run_command(argv, &res); + + /* Cheat. printf's are shorter :) */ + /* (but see bb_putchar() body for additional wrinkle!) */ + xdup2(2, 1); /* just in case libc does something silly :( */ + stdout = stderr; + summarize(output_format, argv, &res); + + if (WIFSTOPPED(res.waitstatus)) + return WSTOPSIG(res.waitstatus); + if (WIFSIGNALED(res.waitstatus)) + return WTERMSIG(res.waitstatus); + if (WIFEXITED(res.waitstatus)) + return WEXITSTATUS(res.waitstatus); + fflush_stdout_and_exit(EXIT_SUCCESS); } |