1 files changed, 59 insertions, 18 deletions

diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c
index 6e25c2659e0a..f6318f6d7baf 100644
--- a/Documentation/accounting/getdelays.c
+++ b/Documentation/accounting/getdelays.c
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <signal.h>
 
 #include <linux/genetlink.h>
@@ -176,6 +177,8 @@ static int get_family_id(int sd)
         rc = send_cmd(sd, GENL_ID_CTRL, getpid(), CTRL_CMD_GETFAMILY,
                         CTRL_ATTR_FAMILY_NAME, (void *)name,
                         strlen(TASKSTATS_GENL_NAME)+1);
+        if (rc < 0)
+                return 0;       /* sendto() failure? */
 
         rep_len = recv(sd, &ans, sizeof(ans), 0);
         if (ans.n.nlmsg_type == NLMSG_ERROR ||
@@ -190,30 +193,37 @@ static int get_family_id(int sd)
         return id;
 }
 
+#define average_ms(t, c) (t / 1000000ULL / (c ? c : 1))
+
 static void print_delayacct(struct taskstats *t)
 {
-        printf("\n\nCPU   %15s%15s%15s%15s\n"
-               "      %15llu%15llu%15llu%15llu\n"
-               "IO    %15s%15s\n"
-               "      %15llu%15llu\n"
-               "SWAP  %15s%15s\n"
-               "      %15llu%15llu\n"
-               "RECLAIM  %12s%15s\n"
-               "      %15llu%15llu\n",
-               "count", "real total", "virtual total", "delay total",
+        printf("\n\nCPU   %15s%15s%15s%15s%15s\n"
+               "      %15llu%15llu%15llu%15llu%15.3fms\n"
+               "IO    %15s%15s%15s\n"
+               "      %15llu%15llu%15llums\n"
+               "SWAP  %15s%15s%15s\n"
+               "      %15llu%15llu%15llums\n"
+               "RECLAIM  %12s%15s%15s\n"
+               "      %15llu%15llu%15llums\n",
+               "count", "real total", "virtual total",
+               "delay total", "delay average",
                (unsigned long long)t->cpu_count,
                (unsigned long long)t->cpu_run_real_total,
                (unsigned long long)t->cpu_run_virtual_total,
                (unsigned long long)t->cpu_delay_total,
-               "count", "delay total",
+               average_ms((double)t->cpu_delay_total, t->cpu_count),
+               "count", "delay total", "delay average",
                (unsigned long long)t->blkio_count,
                (unsigned long long)t->blkio_delay_total,
-               "count", "delay total",
+               average_ms(t->blkio_delay_total, t->blkio_count),
+               "count", "delay total", "delay average",
                (unsigned long long)t->swapin_count,
                (unsigned long long)t->swapin_delay_total,
-               "count", "delay total",
+               average_ms(t->swapin_delay_total, t->swapin_count),
+               "count", "delay total", "delay average",
                (unsigned long long)t->freepages_count,
-               (unsigned long long)t->freepages_delay_total);
+               (unsigned long long)t->freepages_delay_total,
+               average_ms(t->freepages_delay_total, t->freepages_count));
 }
 
 static void task_context_switch_counts(struct taskstats *t)
@@ -266,11 +276,13 @@ int main(int argc, char *argv[])
         int containerset = 0;
         char containerpath[1024];
         int cfd = 0;
+        int forking = 0;
+        sigset_t sigset;
 
         struct msgtemplate msg;
 
-        while (1) {
-                c = getopt(argc, argv, "qdiw:r:m:t:p:vlC:");
+        while (!forking) {
+                c = getopt(argc, argv, "qdiw:r:m:t:p:vlC:c:");
                 if (c < 0)
                         break;
 
@@ -319,6 +331,28 @@ int main(int argc, char *argv[])
                                 err(1, "Invalid pid\n");
                         cmd_type = TASKSTATS_CMD_ATTR_PID;
                         break;
+                case 'c':
+
+                        /* Block SIGCHLD for sigwait() later */
+                        if (sigemptyset(&sigset) == -1)
+                                err(1, "Failed to empty sigset");
+                        if (sigaddset(&sigset, SIGCHLD))
+                                err(1, "Failed to set sigchld in sigset");
+                        sigprocmask(SIG_BLOCK, &sigset, NULL);
+
+                        /* fork/exec a child */
+                        tid = fork();
+                        if (tid < 0)
+                                err(1, "Fork failed\n");
+                        if (tid == 0)
+                                if (execvp(argv[optind - 1],
+                                    &argv[optind - 1]) < 0)
+                                        exit(-1);
+
+                        /* Set the command type and avoid further processing */
+                        cmd_type = TASKSTATS_CMD_ATTR_PID;
+                        forking = 1;
+                        break;
                 case 'v':
                         printf("debug on\n");
                         dbg = 1;
@@ -370,6 +404,15 @@ int main(int argc, char *argv[])
                 goto err;
         }
 
+        /*
+         * If we forked a child, wait for it to exit. Cannot use waitpid()
+         * as all the delicious data would be reaped as part of the wait
+         */
+        if (tid && forking) {
+                int sig_received;
+                sigwait(&sigset, &sig_received);
+        }
+
         if (tid) {
                 rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
                               cmd_type, &tid, sizeof(__u32));
@@ -399,8 +442,6 @@ int main(int argc, char *argv[])
         }
 
         do {
-                int i;
-
                 rep_len = recv(nl_sd, &msg, sizeof(msg), 0);
                 PRINTF("received %d bytes\n", rep_len);
 
@@ -425,7 +466,6 @@ int main(int argc, char *argv[])
 
                 na = (struct nlattr *) GENLMSG_DATA(&msg);
                 len = 0;
-                i = 0;
                 while (len < rep_len) {
                         len += NLA_ALIGN(na->nla_len);
                         switch (na->nla_type) {
@@ -482,6 +522,7 @@ int main(int argc, char *argv[])
                         default:
                                 fprintf(stderr, "Unknown nla_type %d\n",
                                         na->nla_type);
+                        case TASKSTATS_TYPE_NULL:
                                 break;
                         }
                         na = (struct nlattr *) (GENLMSG_DATA(&msg) + len);