Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/time.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/time.c (modified) (17 diffs)

branches/2.2.9/mindi-busybox/miscutils/time.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
-/* `time' utility to display resource usage of processes.
+/* 'time' utility to display resource usage of processes.
    Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
 
-   Licensed under GPL version 2, see file LICENSE in this tarball for details.
+   Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* Originally written by David Keppel <pardo@cs.washington.edu>.
@@ -28 +28 @@
 /* The output format for the -p option .*/
 static const char posix_format[] ALIGN1 = "real %e\nuser %U\nsys %S";
-
 
 /* Format string for printing all statistics verbosely.
@@ -57 +56 @@
     "\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)
-{
-    int status;
+static void resuse_end(pid_t pid, resource_t *resp)
+{
     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;
+    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;
-    resp->waitstatus = status;
-    return 1;
-}
-
-/* Print ARGV, with each entry in ARGV separated by FILLER.  */
-static void printargv(char *const *argv, const char *filler)
-{
-    fputs(*argv, stdout);
-    while (*++argv) {
-        fputs(filler, stdout);
-        fputs(*argv, stdout);
-    }
+    resp->elapsed_ms = monotonic_ms() - resp->elapsed_ms;
+}
+
+static void printargv(char *const *argv)
+{
+    const char *fmt = " %s" + 1;
+    do {
+        printf(fmt, *argv);
+        fmt = " %s";
+    } while (*++argv);
 }
 
@@ -95 +90 @@
    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 ps;
+static unsigned long ptok(const unsigned pagesize, const unsigned long pages)
+{
     unsigned long tmp;
 
-    /* Initialization.  */
-    if (ps == 0)
-        ps = getpagesize();
-
     /* Conversion.  */
-    if (pages > (LONG_MAX / ps)) {  /* Could overflow.  */
-        tmp = pages / 1024; /* Smaller first, */
-        return tmp * ps;    /* then larger.  */
+    if (pages > (LONG_MAX / pagesize)) { /* Could overflow.  */
+        tmp = pages / 1024;     /* Smaller first, */
+        return tmp * pagesize;  /* then larger.  */
     }
     /* Could underflow.  */
-    tmp = pages * ps;   /* Larger first, */
-    return tmp / 1024;  /* then smaller.  */
+    tmp = pages * pagesize; /* Larger first, */
+    return tmp / 1024;      /* then smaller.  */
 }
 
@@ -163 +152 @@
 #endif
 
-static void summarize(const char *fmt, char **command, resource_t * resp)
+static void summarize(const char *fmt, char **command, resource_t *resp)
 {
     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))
+    else */
+    if (WIFSIGNALED(resp->waitstatus))
         printf("Command terminated by signal %u\n",
                 WTERMSIG(resp->waitstatus));
@@ -182 +174 @@
 
 #if (1000 / TICKS_PER_SEC) * TICKS_PER_SEC == 1000
-    /* 1000 is exactly divisible by TICKS_PER_SEC */
+    /* 1000 is exactly divisible by TICKS_PER_SEC (typical) */
     cpu_ticks = vv_ms / (1000 / TICKS_PER_SEC);
 #else
@@ -188 +180 @@
 #endif
     if (!cpu_ticks) cpu_ticks = 1; /* we divide by it, must be nonzero */
-
-    /* putchar() != putc(stdout) in glibc! */
 
     while (*fmt) {
@@ -206 +196 @@
          * for everything. With this we do a lot of 1-byte writes */
         default:
-            putc(*fmt, stdout);
+            bb_putchar(*fmt);
             break;
 #endif
@@ -216 +206 @@
         /* and we do not take format str from user */
             default:
-                putc('%', stdout);
+                bb_putchar('%');
                 /*FALLTHROUGH*/
             case '%':
                 if (!*fmt) goto ret;
-                putc(*fmt, stdout);
+                bb_putchar(*fmt);
                 break;
 #endif
             case 'C':   /* The command that got timed.  */
-                printargv(command, " ");
+                printargv(command);
                 break;
             case 'D':   /* Average unshared data size.  */
                 printf("%lu",
-                        ptok((UL) resp->ru.ru_idrss) / cpu_ticks +
-                        ptok((UL) resp->ru.ru_isrss) / cpu_ticks);
+                    (ptok(pagesize, (UL) resp->ru.ru_idrss) +
+                     ptok(pagesize, (UL) resp->ru.ru_isrss)) / cpu_ticks);
                 break;
             case 'E': { /* Elapsed real (wall clock) time.  */
@@ -253 +243 @@
             case 'K':   /* Average mem usage == data+stack+text.  */
                 printf("%lu",
-                        ptok((UL) resp->ru.ru_idrss) / cpu_ticks +
-                        ptok((UL) resp->ru.ru_isrss) / cpu_ticks +
-                        ptok((UL) resp->ru.ru_ixrss) / cpu_ticks);
+                    (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((UL) resp->ru.ru_maxrss));
+                printf("%lu", ptok(pagesize, (UL) resp->ru.ru_maxrss));
                 break;
             case 'O':   /* Outputs.  */
@@ -311 +301 @@
                 break;
             case 'X':   /* Average shared text size.  */
-                printf("%lu", ptok((UL) resp->ru.ru_ixrss) / cpu_ticks);
+                printf("%lu", ptok(pagesize, (UL) resp->ru.ru_ixrss) / cpu_ticks);
                 break;
             case 'Z':   /* Page size.  */
-                printf("%u", getpagesize());
+                printf("%u", pagesize);
                 break;
             case 'c':   /* Involuntary context switches.  */
@@ -328 +318 @@
                 break;
             case 'p':   /* Average stack segment.  */
-                printf("%lu", ptok((UL) resp->ru.ru_isrss) / cpu_ticks);
+                printf("%lu", ptok(pagesize, (UL) resp->ru.ru_isrss) / cpu_ticks);
                 break;
             case 'r':   /* Incoming socket messages received.  */
@@ -337 +327 @@
                 break;
             case 't':   /* Average resident set size.  */
-                printf("%lu", ptok((UL) resp->ru.ru_idrss) / cpu_ticks);
+                printf("%lu", ptok(pagesize, (UL) resp->ru.ru_idrss) / cpu_ticks);
                 break;
             case 'w':   /* Voluntary context switches.  */
@@ -352 +342 @@
             switch (*++fmt) {
             default:
-                putc('\\', stdout);
+                bb_putchar('\\');
                 /*FALLTHROUGH*/
             case '\\':
                 if (!*fmt) goto ret;
-                putc(*fmt, stdout);
+                bb_putchar(*fmt);
                 break;
             case 't':
-                putc('\t', stdout);
+                bb_putchar('\t');
                 break;
             case 'n':
-                putc('\n', stdout);
+                bb_putchar('\n');
                 break;
             }
@@ -371 +361 @@
     }
  /* ret: */
-    putc('\n', stdout);
+    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)
-{
-    pid_t pid;          /* Pid of child.  */
-    __sighandler_t interrupt_signal, quit_signal;
-
-    resp->elapsed_ms = monotonic_us() / 1000;
-    pid = vfork();      /* 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.  */
-        BB_EXECVP(cmd[0], cmd);
-        bb_error_msg("cannot run %s", cmd[0]);
-        _exit(errno == ENOENT ? 127 : 126);
+static void run_command(char *const *cmd, resource_t *resp)
+{
+    pid_t pid;
+    void (*interrupt_signal)(int);
+    void (*quit_signal)(int);
+
+    resp->elapsed_ms = monotonic_ms();
+    pid = xvfork();
+    if (pid == 0) {
+        /* Child */
+        BB_EXECVP_or_die((char**)cmd);
     }
 
     /* 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);
 
-    if (resuse_end(pid, resp) == 0)
-        bb_error_msg("error waiting for child process");
+    resuse_end(pid, resp);
 
     /* Re-enable signals.  */
@@ -405 +391 @@
 }
 
-int time_main(int argc, char **argv);
-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)
 {
     resource_t res;
     const char *output_format = default_format;
-    char c;
-
-    goto next;
-    /* Parse any options  -- don't use getopt() here so we don't
-     * consume the args of our client application... */
-    while (argc > 0 && argv[0][0] == '-') {
-        while ((c = *++*argv)) {
-            switch (c) {
-            case 'v':
-                output_format = long_format;
-                break;
-            case 'p':
-                output_format = posix_format;
-                break;
-            default:
-                bb_show_usage();
-            }
-        }
- next:
-        argv++;
-        argc--;
-        if (!argc)
-            bb_show_usage();
-    }
+    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 :) */
-    stdout = stderr;
-    dup2(2, 1); /* just in case libc does something silly :( */
+    xdup2(STDERR_FILENO, STDOUT_FILENO);
     summarize(output_format, argv, &res);
 
@@ -448 +419 @@
     if (WIFEXITED(res.waitstatus))
         return WEXITSTATUS(res.waitstatus);
-    fflush_stdout_and_exit(0);
-}
+    fflush_stdout_and_exit(EXIT_SUCCESS);
+}