From nobody Sun Dec 14 06:17:17 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1754494310; cv=none; d=zohomail.com; s=zohoarc; b=i30JcJFmuP4lsev42fpgJYzIMnZ7iBla9JzHEBGXxdTd/NUHfryTT/xVyhOoIFxfPfYlJuRigK8AHpu63Z728zE9LkKjmLmJz0fweRD9MEPvn3PAV27r2dtx7UhpfFlY2c+pVaoUIwSxG3ujqCGe507MgCP+WRt+kYXVahTIRIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754494310; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=t9e4jbvypX+M6FUAntNiqWMyPc7ZVYluPgHcinlKRnI=; b=YAn7Im0yjj1bk3rACfhUW1EAMjQj3xaiwmIez40vpJvSM5t7JS8XyMRkThiyfBH3wAZWgtwS5ln2/noktaeV3tlWmzd9XZSfrA9iszsmXXz1LFZSreInCe5kuSBzEsElTYaOkGeznMM/DkG50GuFrrmKXYn2Zj5786hLIZsptso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754494310689940.6694278580384; Wed, 6 Aug 2025 08:31:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujg7B-0004sw-QA; Wed, 06 Aug 2025 11:31:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ujfiL-0005Ox-HX for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:06:04 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ujfiH-0005Rj-9E for qemu-devel@nongnu.org; Wed, 06 Aug 2025 11:06:00 -0400 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-23fc5aedaf0so48614465ad.2 for ; Wed, 06 Aug 2025 08:05:56 -0700 (PDT) Received: from ubuntu.. ([106.215.156.228]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e899d21dsm160107365ad.139.2025.08.06.08.05.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 08:05:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754492754; x=1755097554; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t9e4jbvypX+M6FUAntNiqWMyPc7ZVYluPgHcinlKRnI=; b=jXm9p03UeYMVCNOZC2wX08/DPSUc8o+K8wq8kZdwYywaE5rlYWRDo0djMV1a3F9A6P 5tCmpIQiKPvLcGqOQyvDOKyUrwR0Vy+tlWtzActVtuHrBtIpa8kiIjBT9S62XZFkbPP9 6TFnMXqWdrhqm1zwcY/9ecV+eABAVPqAJ40Fzt8vQ9V9F2fMEMJtcxGGN0WK8gzEIecn t7fyPGVYfagOwLUj6UdPDzo8mWQkM9uWVR/Z3oWKRiNkveuaSNSihJj5kAAsAmkRntci TFirUe5FRcJlp5rquPc6OFSYzH3jMV2ng+qYx5l3vkI/zuWVIC0J8+b43IMGoW/jWb1j 9DWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754492754; x=1755097554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t9e4jbvypX+M6FUAntNiqWMyPc7ZVYluPgHcinlKRnI=; b=BGngochwvSxNbI6AhKLz8Vl2Z6/v+igD2rfpf+p6rdIcaDpISB8pBc6vOLF1x3PJCE /do1qXQJTWQZHFvh+3r8AgIU9jtMGAUWd3Ozojyf0hrSvzUxQiG7Oxh9FWOYyfJ3+uDt jkYD61QVmcHCrhCJeAAhdMDiQXr3cq4ttpXhXhA/dMlpdmB+lpk6KDJZn6KVPF5mXwun oF5UseG5gWz4KgAetZvzImigqhWPCBWmArM97mpOItb6aXvgN8A9lo4WqsbQUP05pYJT w9W0fJwM4nRqsGpj4K7MWuQUQ4iTnCIkd026Kpef0nOf9looyaoV+g3C6E6brEctQprg fz6Q== X-Gm-Message-State: AOJu0YwmW02X2roAyqnS4faIq5DJV2uWmeX1gSaedhCGTvpvtfZwB8hk XaQyNoAROSHIuLU5T5Ga0vaxdZTcmPQ/SBZHkZ2fPitLKina+UnhVeU70PUfQCAiUqQ= X-Gm-Gg: ASbGnctgX0zWILTOe1vkZOemTsVrau6PeZHp3s6qxifV0MDmoq0ThotywG9pY79pvWA 1SK4W+tG63kRCsJPXx66glTJbKn4KzcE7H5+BfZHqodxEVJ4l77B+Ly2foLkDmnkDlvnj70Boo0 Cy8aCA4X+FqY3cllzNVgpmJKaOoKU1YY4dLtAdfuVFmOAlzuyFAQDTrRqzxYtHcDmslORo2An2E /Ut2zMTpjdvf0KqMzvZyYRHWyCPOEcbPTDYpctkiy7PMEkYLxkpPbJvfRiqHzPvk2srQxyMM6Lr IyB46EALidh3ovI2vqRyWKjjAJHeLx5l2FkHLCpFv727WARSsciA3i8pGo4BkaC7XFptex2PYHW oLJ5DGWzo60FbCEvWY5QJxU// X-Google-Smtp-Source: AGHT+IHh8H8W5zK7NgZH6xjNxocBXrqfxAJwwZk9hsl81Csu5MCuViseH8F3QAVZy7Yp2nAfBBhyXg== X-Received: by 2002:a17:903:298b:b0:23f:8d03:c4ac with SMTP id d9443c01a7336-2429f523e24mr46856285ad.2.1754492752339; Wed, 06 Aug 2025 08:05:52 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org, pbonzini@redhat.com, tanishdesai37@gmail.com Cc: Mads Ynddal , Stefan Hajnoczi Subject: [PATCH v2 2/2] tracetool/format: remove redundent trace-event checks Date: Wed, 6 Aug 2025 15:05:39 +0000 Message-Id: <20250806150539.2871-3-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250806150539.2871-1-tanishdesai37@gmail.com> References: <20250806150539.2871-1-tanishdesai37@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=tanishdesai37@gmail.com; helo=mail-pl1-x62d.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1754494311639116600 Content-Type: text/plain; charset="utf-8" Remove redundent if(check_trace_event) check from individual backends. Adding CHECK_TRACE_EVENT_GET_STATE in log,syslog, dtrace and simple backend. Signed-off-by: Tanish Desai Reviewed-by: Stefan Hajnoczi --- scripts/tracetool/backend/ftrace.py | 12 +++++------- scripts/tracetool/backend/log.py | 10 ++++------ scripts/tracetool/backend/simple.py | 9 ++------- scripts/tracetool/backend/syslog.py | 8 ++------ 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index 5fa30ccc08..c65d3b89b3 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -16,6 +16,7 @@ =20 =20 PUBLIC =3D True +CHECK_TRACE_EVENT_GET_STATE =3D True =20 =20 def generate_h_begin(events, group): @@ -28,11 +29,10 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - out(' {', - ' char ftrace_buf[MAX_TRACE_STRLEN];', - ' int unused __attribute__ ((unused));', - ' int trlen;', - ' if (trace_event_get_state(%(event_id)s)) {', + out(' {', + ' char ftrace_buf[MAX_TRACE_STRLEN];', + ' int unused __attribute__ ((unused));', + ' int trlen;', '#line %(event_lineno)d "%(event_filename)s"', ' trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN,', ' "%(name)s " %(fmt)s "\\n" %(argnames= )s);', @@ -40,10 +40,8 @@ def generate_h(event, group): ' trlen =3D MIN(trlen, MAX_TRACE_STRLEN - 1);', ' unused =3D write(trace_marker_fd, ftrace_buf, trlen);= ', ' }', - ' }', name=3Devent.name, args=3Devent.args, - event_id=3D"TRACE_" + event.name.upper(), event_lineno=3Devent.lineno, event_filename=3Devent.filename, fmt=3Devent.fmt.rstrip("\n"), diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index eb50ceea34..2aa180f4b4 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -16,6 +16,7 @@ =20 =20 PUBLIC =3D True +CHECK_TRACE_EVENT_GET_STATE =3D True =20 =20 def generate_h_begin(events, group): @@ -28,14 +29,11 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) - - out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', + out(' if (qemu_loglevel_mask(LOG_TRACE)) {', '#line %(event_lineno)d "%(event_filename)s"', - ' qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);', + ' qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);', '#line %(out_next_lineno)d "%(out_filename)s"', - ' }', - cond=3Dcond, + ' }', event_lineno=3Devent.lineno, event_filename=3Devent.filename, name=3Devent.name, diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index 7c84c06b20..623ea7d8ed 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -16,7 +16,7 @@ =20 =20 PUBLIC =3D True - +CHECK_TRACE_EVENT_GET_STATE =3D True =20 def is_string(arg): strtype =3D ('const char*', 'char*', 'const char *', 'char *') @@ -36,13 +36,8 @@ def generate_h_begin(events, group): =20 =20 def generate_h(event, group): - event_id =3D 'TRACE_' + event.name.upper() - cond =3D "trace_event_get_state(%s)" % event_id - out(' if (%(cond)s) {', - ' _simple_%(api)s(%(args)s);', - ' }', + out(' _simple_%(api)s(%(args)s);', api=3Devent.api(), - cond=3Dcond, args=3D", ".join(event.args.names())) =20 =20 diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 3f82e54aab..04ec85717a 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -16,6 +16,7 @@ =20 =20 PUBLIC =3D True +CHECK_TRACE_EVENT_GET_STATE =3D True =20 =20 def generate_h_begin(events, group): @@ -28,14 +29,9 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) - - out(' if (%(cond)s) {', - '#line %(event_lineno)d "%(event_filename)s"', + out('#line %(event_lineno)d "%(event_filename)s"', ' syslog(LOG_INFO, "%(name)s " %(fmt)s %(argnames)s);', '#line %(out_next_lineno)d "%(out_filename)s"', - ' }', - cond=3Dcond, event_lineno=3Devent.lineno, event_filename=3Devent.filename, name=3Devent.name, --=20 2.34.1