From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755869AbZDOX2B (ORCPT ); Wed, 15 Apr 2009 19:28:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752793AbZDOX1g (ORCPT ); Wed, 15 Apr 2009 19:27:36 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:56069 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424AbZDOX1f (ORCPT ); Wed, 15 Apr 2009 19:27:35 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=g9kAbK4oJGsHtYddia90hQgDA/amFio0WrWE7bVz/h/qBzxomPGwlxd1n/KCTYu7rK e3VqfAUIyXPBhjfHPqXvKeddVwX3f0V0cb6rDSSyBz+yFscOYi3awm5awp3jKCVvY9px V/o2S6FOtTO3WlJ4aoIEo70YH6qjWV8pxNED8= From: Frederic Weisbecker To: Ingo Molnar , Steven Rostedt Cc: Zhaolei , Tom Zanussi , Li Zefan , KOSAKI Motohiro , LKML , Frederic Weisbecker , Peter Zijlstra Subject: [RFC][PATCH 2/2] tracing/lock: provide lock_acquired event support for dynamic size string Date: Thu, 16 Apr 2009 01:27:30 +0200 Message-Id: <1239838050-8567-2-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.6.1 In-Reply-To: <1239838050-8567-1-git-send-email-fweisbec@gmail.com> References: <1239838050-8567-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we can support the dynamic sized string, make the lock tracing able to use it, making it safe against modules removal and consuming the right amount of memory needed for each lock name Signed-off-by: Frederic Weisbecker --- include/trace/events/lockdep.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/events/lockdep.h b/include/trace/events/lockdep.h index 45e326b..48356b7 100644 --- a/include/trace/events/lockdep.h +++ b/include/trace/events/lockdep.h @@ -38,12 +38,12 @@ TRACE_EVENT(lock_acquired, TP_ARGS(lock, ip, waittime), TP_STRUCT__entry( - __field(const char *, name) __field(unsigned long, wait_usec) __field(unsigned long, wait_nsec_rem) + __ending_string(name) ), TP_fast_assign( - __entry->name = lock->name; + open_string_assign(lock_acquired, name, lock->name); __entry->wait_nsec_rem = do_div(waittime, NSEC_PER_USEC); __entry->wait_usec = (unsigned long) waittime; ), -- 1.6.1