The patch titled
Documentation: fix getdelays.c example -l option and segv
has been removed from the -mm tree. Its filename was
documentation-fix-getdelaysc-example-l-option-and-segv.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Documentation: fix getdelays.c example -l option and segv
From: Michael Neuling <mikey@xxxxxxxxxxx>
Fix a couple of minor issues with the getdelays.c example code. -l option
(loop) doesn't work and it seg faults in print_delayacct.
Signed-off-by: Michael Neuling <mikey@xxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/accounting/getdelays.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff -puN Documentation/accounting/getdelays.c~documentation-fix-getdelaysc-example-l-option-and-segv Documentation/accounting/getdelays.c
--- a/Documentation/accounting/getdelays.c~documentation-fix-getdelaysc-example-l-option-and-segv
+++ a/Documentation/accounting/getdelays.c
@@ -196,7 +196,7 @@ void print_delayacct(struct taskstats *t
"IO %15s%15s\n"
" %15llu%15llu\n"
"MEM %15s%15s\n"
- " %15llu%15llu\n"
+ " %15llu%15llu\n",
"count", "real total", "virtual total", "delay total",
t->cpu_count, t->cpu_run_real_total, t->cpu_run_virtual_total,
t->cpu_delay_total,
@@ -335,17 +335,17 @@ int main(int argc, char *argv[])
}
}
- if (tid) {
- rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
- cmd_type, &tid, sizeof(__u32));
- PRINTF("Sent pid/tgid, retval %d\n", rc);
- if (rc < 0) {
- fprintf(stderr, "error sending tid/tgid cmd\n");
- goto done;
+ do {
+ if (tid) {
+ rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
+ cmd_type, &tid, sizeof(__u32));
+ PRINTF("Sent pid/tgid, retval %d\n", rc);
+ if (rc < 0) {
+ fprintf(stderr, "error sending tid/tgid cmd\n");
+ goto done;
+ }
}
- }
- do {
int i;
rep_len = recv(nl_sd, &msg, sizeof(msg), 0);
@@ -430,6 +430,7 @@ int main(int argc, char *argv[])
}
na = (struct nlattr *) (GENLMSG_DATA(&msg) + len);
}
+ sleep(2);
} while (loop);
done:
if (maskset) {
_
Patches currently in -mm which might be from mikey@xxxxxxxxxxx are
origin.patch
add-scaled-time-to-taskstats-based-process-accounting.patch
powerpc-add-scaled-time-accounting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
