From patchwork Sun Mar 27 19:43:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?Q?Llu=C3=ADs?= X-Patchwork-Id: 88523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 979E5B6FB1 for ; Mon, 28 Mar 2011 07:09:31 +1100 (EST) Received: from localhost ([127.0.0.1]:50080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q3vxB-00015D-9i for incoming@patchwork.ozlabs.org; Sun, 27 Mar 2011 15:48:49 -0400 Received: from [140.186.70.92] (port=60263 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q3vsJ-0006zb-2v for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q3vs9-0006Wu-6a for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:38 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:33646) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1Q3vs8-0006Wp-Lf for qemu-devel@nongnu.org; Sun, 27 Mar 2011 15:43:37 -0400 Received: (qmail invoked by alias); 27 Mar 2011 19:43:34 -0000 Received: from unknown (EHLO localhost) [84.88.53.92] by mail.gmx.net (mp042) with SMTP; 27 Mar 2011 21:43:34 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX1+U2vM+/UaU5pbaUPgSeukb40Nrq+cxq7NnemXyxJ mb8WkuH70v1/sM To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Date: Sun, 27 Mar 2011 21:43:25 +0200 Message-ID: <20110327194325.622.66779.stgit@ginnungagap.bsc.es> In-Reply-To: <20110327194249.622.69985.stgit@ginnungagap.bsc.es> References: <20110327194249.622.69985.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.22 Subject: [Qemu-devel] [PATCH 3/4] trace: always use the "nop" backend on events with the "disable" keyword X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Any event with the keyword/property "disable" generates an empty trace event using the "nop" backend, regardless of the current backend. Signed-off-by: Lluís Vilanova --- docs/tracing.txt | 3 +++ scripts/tracetool | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/docs/tracing.txt b/docs/tracing.txt index 5dbd3c0..49e030e 100644 --- a/docs/tracing.txt +++ b/docs/tracing.txt @@ -126,6 +126,9 @@ The "nop" backend generates empty trace event functions so that the compiler can optimize out trace events completely. This is the default and imposes no performance penalty. +Note that regardless of the selected trace backend, events with the "disable" +property will be generated with the "nop" backend. + === Stderr === The "stderr" backend sends trace events directly to standard error. This diff --git a/scripts/tracetool b/scripts/tracetool index 6d8ead2..7506776 100755 --- a/scripts/tracetool +++ b/scripts/tracetool @@ -506,21 +506,10 @@ convert() # Skip comments and empty lines test -z "${str%%#*}" && continue + echo # Process the line. The nop backend handles disabled lines. - disable="0" if has_property "$str" "disable"; then - disable="1" - fi - echo - if [ "$disable" = "1" ]; then - # Pass the disabled state as an arg for the simple - # or DTrace backends which handle it dynamically. - # For all other backends, call lineto$1_nop() - if [ $backend = "simple" -o "$backend" = "dtrace" ]; then - "$process_line" "$str" - else - "lineto$1_nop" "${str##disable }" - fi + "lineto$1_nop" "$str" else "$process_line" "$str" fi