Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754415AbYKYVpY (ORCPT ); Tue, 25 Nov 2008 16:45:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753909AbYKYVhH (ORCPT ); Tue, 25 Nov 2008 16:37:07 -0500 Received: from www.tglx.de ([62.245.132.106]:34885 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753891AbYKYVhF (ORCPT ); Tue, 25 Nov 2008 16:37:05 -0500 Date: Tue, 25 Nov 2008 22:36:48 +0100 (CET) From: Thomas Gleixner To: Joe Korty cc: Michael Kerrisk , Ingo Molnar , LKML , "linux-api@vger.kernel.org" Subject: Re: [PATCH] Display active jiffie timers in /proc/timer_list In-Reply-To: <20081125185740.GA21806@tsunami.ccur.com> Message-ID: References: <20081121221113.GA13566@tsunami.ccur.com> <517f3f820811250806n33850ea8ua8e203347c0f7ba6@mail.gmail.com> <20081125185740.GA21806@tsunami.ccur.com> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2836 Lines: 97 Joe, On Tue, 25 Nov 2008, Joe Korty wrote: > Add to /proc/timer_list a display of the active jiffie timers. > > Tested on i386 and x86_64, with 'less /proc/timer_list' and > through SysRq-Q. > > Signed-off-by: Joe Korty > > Index: 2.6.28-rc6/kernel/timer.c > =================================================================== > --- 2.6.28-rc6.orig/kernel/timer.c 2008-11-25 11:59:07.000000000 -0500 > +++ 2.6.28-rc6/kernel/timer.c 2008-11-25 13:49:05.000000000 -0500 > @@ -36,6 +36,8 @@ > #include > #include > #include > +#include > +#include > #include > > #include > @@ -1568,6 +1570,87 @@ > open_softirq(TIMER_SOFTIRQ, run_timer_softirq); > } > > +#if defined(CONFIG_PROC_FS) || defined(CONFIG_MAGIC_SYSRQ) This belongs into kernel/time/timer_list.c and there is no need to copy that code around. > +void print_cpu_jtimers(struct seq_file *m, int cpu) > +{ > + int i; > + struct tvec_base *base = per_cpu(tvec_bases, cpu); > + > + SEQ_printf(m, "active jiffie timers:\n"); > + spin_lock_irq(&base->lock); Yuck. We really do _NOT_ stop everything just to print timers. Check the hrtimer print code in timer_list.c > Index: 2.6.28-rc6/kernel/time/timer_list.c > =================================================================== > --- 2.6.28-rc6.orig/kernel/time/timer_list.c 2008-11-25 11:59:07.000000000 -0500 > +++ 2.6.28-rc6/kernel/time/timer_list.c 2008-11-25 13:47:30.000000000 -0500 > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > > #include > > @@ -139,6 +140,7 @@ > SEQ_printf(m, " clock %d:\n", i); > print_base(m, cpu_base->clock_base + i, now); > } > + random whitespace change > #define P(x) \ > SEQ_printf(m, " .%-15s: %Lu\n", #x, \ > (unsigned long long)(cpu_base->x)) > @@ -176,9 +178,11 @@ > P(last_jiffies); > P(next_jiffies); > P_ns(idle_expires); > - SEQ_printf(m, "jiffies: %Lu\n", > + SEQ_printf(m, "jiffies: %llu (0x%llx)\n", > + (unsigned long long)jiffies, > (unsigned long long)jiffies); The exact purpose of this change ? > @@ -286,7 +290,7 @@ > { > struct proc_dir_entry *pe; > > - pe = proc_create("timer_list", 0644, NULL, &timer_list_fops); > + pe = proc_create("timer_list", 0444, NULL, &timer_list_fops); > if (!pe) > return -ENOMEM; > return 0; Correct, but unrelated $subject. Separate patch please. Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/