From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758076AbZFIVyr (ORCPT ); Tue, 9 Jun 2009 17:54:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758446AbZFIVxm (ORCPT ); Tue, 9 Jun 2009 17:53:42 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:51189 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756910AbZFIVxi (ORCPT ); Tue, 9 Jun 2009 17:53:38 -0400 Message-Id: <20090609215340.000084253@goodmis.org> References: <20090609215211.307980196@goodmis.org> User-Agent: quilt/0.46-1 Date: Tue, 09 Jun 2009 17:52:18 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Minchan Kim , Mel Gorman , Christoph Hellwig , Rik van Riel , Pekka Enberg , Peter Zijlstra , Frederic Weisbecker , Theodore Tso , Mathieu Desnoyers , Lai Jiangshan , Zhaolei , KOSAKI Motohiro , Jason Baron , Jiaying Zhang , Tom Zanussi Subject: [PATCH 7/8] tracing/events: modify lockdep print to new format Content-Disposition: inline; filename=0007-tracing-events-modify-lockdep-print-to-new-format.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt Use new format for better parsing of lockdep events. Cc: Peter Zijlstra Signed-off-by: Steven Rostedt --- include/trace/events/lockdep.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/trace/events/lockdep.h b/include/trace/events/lockdep.h index 0e956c9..f9d74c8 100644 --- a/include/trace/events/lockdep.h +++ b/include/trace/events/lockdep.h @@ -27,9 +27,8 @@ TRACE_EVENT(lock_acquire, __assign_str(name, lock->name); ), - TP_printk("%s%s%s", (__entry->flags & 1) ? "try " : "", - (__entry->flags & 2) ? "read " : "", - __get_str(name)) + TP_FORMAT("" + "") ); TRACE_EVENT(lock_release, @@ -46,7 +45,7 @@ TRACE_EVENT(lock_release, __assign_str(name, lock->name); ), - TP_printk("%s", __get_str(name)) + TP_FORMAT("") ); #ifdef CONFIG_LOCK_STAT @@ -65,7 +64,7 @@ TRACE_EVENT(lock_contended, __assign_str(name, lock->name); ), - TP_printk("%s", __get_str(name)) + TP_FORMAT("") ); TRACE_EVENT(lock_acquired, @@ -83,8 +82,7 @@ TRACE_EVENT(lock_acquired, __entry->wait_nsec_rem = do_div(waittime, NSEC_PER_USEC); __entry->wait_usec = (unsigned long) waittime; ), - TP_printk("%s (%lu.%03lu us)", __get_str(name), __entry->wait_usec, - __entry->wait_nsec_rem) + TP_FORMAT(" (. us)") ); #endif -- 1.6.3.1 --