diff options
| author | Ingo Molnar <mingo@elte.hu> | 2007-05-08 00:28:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:07 -0700 |
| commit | 8f0c45cdf87dc9141e87b0ad2fc6fff216a95f79 (patch) | |
| tree | 1940c1f08b9bc6e2429559ba19b71b725ad9524c | |
| parent | b73a7e76c1eeaa770a41554698917c3c45686a07 (diff) | |
| download | linux-stable-8f0c45cdf87dc9141e87b0ad2fc6fff216a95f79.tar.gz linux-stable-8f0c45cdf87dc9141e87b0ad2fc6fff216a95f79.tar.bz2 linux-stable-8f0c45cdf87dc9141e87b0ad2fc6fff216a95f79.zip | |
enhance initcall_debug, measure latency
enhance the initcall_debug boot option:
- measure the time the initcall took to execute and report
it in units of milliseconds.
- show the return code of initcalls (useful to see failures and
to make sure that an initcall hung)
[akpm@linux-foundation.org: fix printk warning]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | init/main.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 949c27b59d12..c1537e0ddceb 100644 --- a/init/main.c +++ b/init/main.c @@ -648,6 +648,7 @@ static void __init do_initcalls(void) int count = preempt_count(); for (call = __initcall_start; call < __initcall_end; call++) { + ktime_t t0, t1, delta; char *msg = NULL; char msgbuf[40]; int result; @@ -657,10 +658,26 @@ static void __init do_initcalls(void) print_fn_descriptor_symbol(": %s()", (unsigned long) *call); printk("\n"); + t0 = ktime_get(); } result = (*call)(); + if (initcall_debug) { + t1 = ktime_get(); + delta = ktime_sub(t1, t0); + + printk("initcall 0x%p", *call); + print_fn_descriptor_symbol(": %s()", + (unsigned long) *call); + printk(" returned %d.\n", result); + + printk("initcall 0x%p ran for %Ld msecs: ", + *call, (unsigned long long)delta.tv64 >> 20); + print_fn_descriptor_symbol("%s()\n", + (unsigned long) *call); + } + if (result && result != -ENODEV && initcall_debug) { sprintf(msgbuf, "error code %d", result); msg = msgbuf; |