From nobody Sat Feb 7 02:20:54 2026 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=1750430298; cv=none; d=zohomail.com; s=zohoarc; b=anaYR3C7yP6jat8d4qobF5D/Q9fMgjoWjPa1hMrzVpn6sAeC3gqeijg8drxYG8W2eFy2HKMbym5rqctA7bMwLbZuqi1xidN0I/tdnbHV+AmHselGv44tsfugR+rJdq4Q5r+d9uMtmpiMVccOAX2qa3J1mB+95kIkJxfsYJaI8Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750430298; 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=7EOZuE27rMxCbmFwxycMCT8+sPkrS3/sMxJ+gWLILdM=; b=aRedEA//S2TLGxN5VJldk1MWXzL15BIh8+lb6Sp+l3JCErEFoNEqDnP5cWNjAaoUifW7d21GHQYioblu/sZcp6NF/WxydBuliGXnUZS4YA+vZAIc8tjvvm4ZjS7gY3vwIyLX7G2scnIl//Am0yKCdLCObdRTOeNZ47AMQ467GEo= 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 1750430298862295.8464440512662; Fri, 20 Jun 2025 07:38:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uScs9-0000IH-B9; Fri, 20 Jun 2025 10:37:42 -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 1uScs1-0000Gd-9L for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:33 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uScry-0001il-Ho for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:32 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-3138d31e40aso1795211a91.1 for ; Fri, 20 Jun 2025 07:37:29 -0700 (PDT) Received: from ubuntu.. ([27.61.32.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3158a2f0cf5sm4368820a91.26.2025.06.20.07.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jun 2025 07:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750430248; x=1751035048; 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=7EOZuE27rMxCbmFwxycMCT8+sPkrS3/sMxJ+gWLILdM=; b=T+EjG4OBJsymbS10IpQwhLwP7XrfgYyeOFqK7qxQ+nz6G7H6CBrAzO2OkXOltp3pl9 AxgdxUxGTb0inmghy7L+/pVNdTo9gi1GXi3EGALJFRNDmuKnRLD7OJ9eHKXHJlFspoMD 9pm9wHlTGmqd3diYydXTNcHYr4cR+QMDxzp+M5OzE48KXLhkE84M4zqQVO7X5WCRoGd4 cet012UyGC/WGbtxxA64WKdF4zETKO2Q3/X7bKp2XfgE48Yvx80/Ly5OsZWlkr6oqyLz JEe6ZoVTKF6jU1wQC4LiO1AFAO+SML2GoWbC1DFjzIZki3gkEDza7Apwao0u7wV62xcz aRtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750430248; x=1751035048; 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=7EOZuE27rMxCbmFwxycMCT8+sPkrS3/sMxJ+gWLILdM=; b=oM4fIswZsaZTN0vokl0ZLCzAKgNuAQncQVubiC68ysn8zNqCqRnZZsm6XtOl7a3gG6 oy4Pwc56aaZ26lYQCgoSsAp9qHDYoWYuw6CUkp4FRBk4srgZKQyVPQwoLhdBNygkGp1D meUsqwSuOWTiRlavh00n5LIHukh3OtdeSbqLeaPE6G7dWQTlx0y7/3qpFrKdNfQQdvT6 WDmMjPaXMNnmsse1fu8vfYdzTgg6+jjqDXrTTlUNKukT0mWbrEpnxzU6oMZ8bxu9gkXZ ACgUIJJsweIbhXbLkkF6sIrKjYwR8elMB8Yxb0LSfx+mbwZKrZsHqWH+W2rdzc4VKb0T p0qA== X-Gm-Message-State: AOJu0YzoFwRBNOhdyvoa5adPNzdU9h8Aoq14nrN4YEXZpvyWV9IqQInF m6QZ44kRL/+Vku/nq2iVxYJ6Ho+/Gm2S4WW+PM6N9oWTU0yeNnGOJzid8I5ns6Gn6OPfMg== X-Gm-Gg: ASbGncvgV8sFUaBGBB1IcYyz9NNbrllg5IL/n34N0ZBNZJ5d9uiCA7lJveKy9QQImZv nEf7asRAJywsSwO32vp+P4lV5iXm42drKmAlSQ4LHzK+QbwdfC91wrhRRj9HNkc7UIbM+fLLOiT WrmFHTBG74bhfP6f1XvJq6b0aYSFc1TMbvpgw0C6x/vkL7rMsXC0rza8LVUAnu6oC67N5utwFAl 9sk1evM681J9a++TtHk8TVOZgt8c+Er8j5cyLOIzgDQE36dleWYIbKAqjPp6cnJp7lx2CM/RZzD 0lmUIDoiblEJ7aUTUR2a4qRNumeKI03C3p/bmWkQy7gS5RuqdjoscNBlBWxnkpc6u9thriFGdMO xbxUd/KU= X-Google-Smtp-Source: AGHT+IEqjeD7EaC0kCRHoLPhXmQabmXgc4btLqBTNHVhO9iI3S6Mw8TLcjM09yQpGkJ4SXykUv62Yg== X-Received: by 2002:a17:90b:5105:b0:311:a314:c2ca with SMTP id 98e67ed59e1d1-3159d620720mr4522924a91.6.1750430247691; Fri, 20 Jun 2025 07:37:27 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal , Tanish Desai Subject: [PATCH v2 1/3] tracetool: removed the unused vcpu property Date: Fri, 20 Jun 2025 14:37:18 +0000 Message-Id: <20250620143720.3143-2-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250620143720.3143-1-tanishdesai37@gmail.com> References: <20250620143720.3143-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::102f; envelope-from=tanishdesai37@gmail.com; helo=mail-pj1-x102f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1750430301217116600 Content-Type: text/plain; charset="utf-8" The vcpu property is no longer used in these backends. Removing it avoids unnecessary checks and simplifies the code generation for these trace backends. Signed-off-by: Tanish Desai --- scripts/tracetool/__init__.py | 6 +++--- scripts/tracetool/backend/log.py | 6 +----- scripts/tracetool/backend/simple.py | 6 +----- scripts/tracetool/backend/syslog.py | 6 +----- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index bc03238c0f..e86c898a1e 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -216,9 +216,9 @@ class Event(object): r"\s*" r"(?:(?:(?P\".+),)?\s*(?P\".+))?" r"\s*") - - _VALID_PROPS =3D set(["disable", "vcpu"]) - + =20 + _VALID_PROPS =3D set(["disable"]) + =20 def __init__(self, name, props, fmt, args, lineno, filename, orig=3DNo= ne, event_trans=3DNone, event_exec=3DNone): """ diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index de27b7e62e..f24acad74c 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -31,11 +31,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) + cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) =20 out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', ' if (message_with_timestamp) {', diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index 2688d4b64b..7c84c06b20 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -37,11 +37,7 @@ def generate_h_begin(events, group): =20 def generate_h(event, group): event_id =3D 'TRACE_' + event.name.upper() - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % event_id + cond =3D "trace_event_get_state(%s)" % event_id out(' if (%(cond)s) {', ' _simple_%(api)s(%(args)s);', ' }', diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 012970f6cc..6fdc1142fb 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -30,11 +30,7 @@ def generate_h(event, group): if len(event.args) > 0: argnames =3D ", " + argnames =20 - if "vcpu" in event.properties: - # already checked on the generic format code - cond =3D "true" - else: - cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) + cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) =20 out(' if (%(cond)s) {', '#line %(event_lineno)d "%(event_filename)s"', --=20 2.34.1 From nobody Sat Feb 7 02:20:54 2026 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=1750430322; cv=none; d=zohomail.com; s=zohoarc; b=OLUxX9uyRFnqbgm6XnWsTlbTepfU+YzHzcakwK3khPyxLUOcIkiZMwqpbkgGv1+i7yQVm6vbdNvw3ZcrD9FX8PzihwkMOXT6AnGJJvfoWUJs7oi2KImiqnxfblCHvayH4Z1sszceKLgS1cwfPhqXTIZ6WeG7U1V8U9t51dQETYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750430322; 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=Mo/UcdRBnmSx+dkvg7nn6+3os5maF0Sk3Z74fE1uACY=; b=aCHDCXd/x3VCVEVLRmNPKjTrtaw1kxoBcbZowSee3eSYKdtCP1Mvy+ItPqoshzZIcsptxR1mHobUX3/zjikpQwswJZO7gpAqakDo5l3OjGsq+jnwf8aWTXG3sMlnqct4efyWdKWHL49St5uxaWaP9vAo4UhuZ+eQbtGs7K5vd4M= 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 1750430322111467.8334571362883; Fri, 20 Jun 2025 07:38:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uScsD-0000J7-UX; Fri, 20 Jun 2025 10:37:45 -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 1uScs3-0000Hj-6Y for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:35 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uScs1-0001is-0d for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:34 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-311a6236effso1331740a91.2 for ; Fri, 20 Jun 2025 07:37:31 -0700 (PDT) Received: from ubuntu.. ([27.61.32.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3158a2f0cf5sm4368820a91.26.2025.06.20.07.37.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jun 2025 07:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750430250; x=1751035050; 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=Mo/UcdRBnmSx+dkvg7nn6+3os5maF0Sk3Z74fE1uACY=; b=bE1ajetK0L4hp9s9Llkq61XqEWHVv1of1+ToG0Y90y+f2AX4l19/r7GTo6cS96cGk7 TNf+y4cKpNeflPO7xqUEPlu7op43/+nJflPwl2UmR4UCD0lc6fPvROLVzwgKxwiqN/AO fvDSjqTIhNvDVxeIorZmmRFW5k0lYd8Ffte/aQQBXG2xvx/kXVCQSghVSif5vs070ZJ/ Zmgta12mJxt/dHT6LCwVq5Gr5tXc+XTynmBXrvqRlGQjj0lRJCeOipS9NFJfFs35r2gx ap5vXH878yWYEuW0w/OSAP3R/CRelT8ga5SAVUOq96cV07uAHF9KLMIUVHe/RucaSqwD NfIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750430250; x=1751035050; 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=Mo/UcdRBnmSx+dkvg7nn6+3os5maF0Sk3Z74fE1uACY=; b=Lr77RZ3jZOyIdffGnKHwIt4W4GYc21q56VcWv+elgB3AI01GhOffspGAdD82S42quO mH5FaLsyPPGbJQ2h/0vfM8F5OAtkRjZmy178tGZFag0iAL3WnDnXFv5ohAWuMdAbOLyn UpQJGT+DkSe/tqinuTO+2ikBNGSQ893bTqqIKkYX6qgcYKabzAR7dEvn4Y3ydbyY+MgM DuLT6eu0FBhqKHXDhJsPzPwuFgCcuZVcqLXSfijAgpQrpV/JJpYG85+x8GaSu+wBs7cz qw1rI0JPBDag/Jd2kvu2Lw6sWi+kzzXEhNgUNRdpszYHVs35KNyue2AnCFmNGsELqxNZ TEAA== X-Gm-Message-State: AOJu0Yz2YXZzejSLtS3VmzxnI+4zLupINuqpRqokh7blU5LyjvYonIj4 qcqKYG9b96bOgktoKTjK/lJd5mtMsQ0z6OLU6+o+ZUhj6W5BwBbWSz5OGyp0XqdKfcIe6g== X-Gm-Gg: ASbGncsgmWbs9rAArYtC65SngM8aWcYmQMtUKJEXgho6XhwFn2wjkMpjyKRXwwiygOo sbaHHH4RIelxOzONpoiMuhuJ16ath2b+I7+BK0NbaWmCqSL78k0SUxANlebFchmwTFpCmwsGxEC slgrbZXzLRgHfD8J6WHRwRa0H+5/xxWMT3Sm80/jQJfmrVBijhx9ElEtFVfNFP7vSPaOrL+5MyA a+fbR7OpEfU2l4Z3ER2QXpu7K5rhnmmBXQtLql03gh+BbRnPCUB07KN/iJxvmhQM8h9UyyrvRBv B1CmrOKAhilEPWDKl4hM8YMnC/CYL3QOAOLxvI8pEHwRh1E+Opm7tG7vAUm0fEFKcXLGhiDhB30 /8PXfy48= X-Google-Smtp-Source: AGHT+IGg8UVSEyjWg/V2EETztL/F211NPlIQJLdlQEf3yvz4E21Wu9inpqoriaroxDhvRDHuqq5GAw== X-Received: by 2002:a17:90b:1e53:b0:313:31ca:a69 with SMTP id 98e67ed59e1d1-3159d8c8f6cmr6349137a91.18.1750430249983; Fri, 20 Jun 2025 07:37:29 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal , Tanish Desai Subject: [PATCH v2 2/3] tracetool: introduce generate_unconditional Date: Fri, 20 Jun 2025 14:37:19 +0000 Message-Id: <20250620143720.3143-3-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250620143720.3143-1-tanishdesai37@gmail.com> References: <20250620143720.3143-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::1031; envelope-from=tanishdesai37@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1750430323459116600 Content-Type: text/plain; charset="utf-8" This patch separates the generation logic of trace_foo() for the UST and DTrace backends from other backends. The motivation is to remove the unnecessary if (true) in the trace_foo() function, as UST and DTrace do not require a trace_event_get_state check without introducing a seperate function it is very difficult to generate code which keeps them out of unified if condition. With this separation, we can safely move the trace_event_get_state check into trace_foo for the other backends only, keeping UST/DTrace generation paths clean. A new generate_h_unconditional function has been introduced for UST and DTr= ace. It behaves similarly to generate_h, but is defined only in UST and DTrace backends. This ensures that generate_h is used by the other backends, while UST/DTrace selectively use generate_h_unconditional. Signed-off-by: Tanish Desai --- scripts/tracetool/backend/__init__.py | 3 +++ scripts/tracetool/backend/dtrace.py | 3 ++- scripts/tracetool/backend/ust.py | 2 +- scripts/tracetool/format/h.py | 10 +++++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/back= end/__init__.py index 7bfcc86cc5..c4456a5efd 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -118,6 +118,9 @@ def generate_begin(self, events, group): def generate(self, event, group): self._run_function("generate_%s", event, group) =20 + def generate_unconditional(self, event, group): + self._run_function("generate_%s_unconditional", event, group) + =20 def generate_backend_dstate(self, event, group): self._run_function("generate_%s_backend_dstate", event, group) =20 diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index e17edc9b9d..171b7e09ed 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -61,7 +61,8 @@ def generate_h_begin(events, group): '#endif', uppername=3De.name.upper()) =20 -def generate_h(event, group): + +def generate_h_unconditional(event, group): out(' QEMU_%(uppername)s(%(argnames)s);', uppername=3Devent.name.upper(), argnames=3D", ".join(event.args.names())) diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/u= st.py index c857516f21..1564b490ec 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -30,7 +30,7 @@ def generate_h_begin(events, group): '') =20 =20 -def generate_h(event, group): +def generate_h_unconditional(event, group): argnames =3D ", ".join(event.args.names()) if len(event.args) > 0: argnames =3D ", " + argnames diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index ea126b07ea..89d54b9aff 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -76,13 +76,17 @@ def generate(events, backend, group): out('', 'static inline void %(api)s(%(args)s)', '{', - ' if (%(cond)s) {', + api=3De.api(), + args=3De.args) + =20 + if "disable" not in e.properties: + backend.generate_unconditional(e, group) + + out(' if (%(cond)s) {', ' %(api_nocheck)s(%(names)s);', ' }', '}', - api=3De.api(), api_nocheck=3De.api(e.QEMU_TRACE_NOCHECK), - args=3De.args, names=3D", ".join(e.args.names()), cond=3Dcond) =20 --=20 2.34.1 From nobody Sat Feb 7 02:20:54 2026 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=1750430317; cv=none; d=zohomail.com; s=zohoarc; b=oGlc57UstAr6/dmaC/YyzqUOh3hiaXlWItitszfQUJ2B2HJtw9qHWQoFHGC0jx1GHPxZhPTLdh2hNUL8/rZvabVOnvoh7v8SOS+D7vG7ijEAIZGnmjbHuUI53oBOqie54DTkiIZANc+4i6BWolEZ5ZjxwdcrsHv9afl4OnI2xjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750430317; 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=rmgSEfeN8Rj2llj00/Kzt6ONzAD2UZfzQQNsTGfLFsw=; b=E0yOkuBTdcIkfegg/29zoGDuVXZ3WX1WAIL3re8rMh2Izb9tB8U8vmWw6mAOwV9HtxXDojVLvn3feSEP5R/kvzLqOUs1sp3uPfGHyl2vS1Nu1I9f1jloyTscST7nr6DxmagtEx206cCbE6yHK//vc0B2srvLDbD0NyWSZcCJw6g= 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 1750430317138225.60046473714715; Fri, 20 Jun 2025 07:38:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uScsQ-0000Kv-CW; Fri, 20 Jun 2025 10:37:58 -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 1uScs7-0000IL-1A for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:41 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uScs2-0001jP-W8 for qemu-devel@nongnu.org; Fri, 20 Jun 2025 10:37:37 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-b0b2d0b2843so1391654a12.2 for ; Fri, 20 Jun 2025 07:37:33 -0700 (PDT) Received: from ubuntu.. ([27.61.32.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3158a2f0cf5sm4368820a91.26.2025.06.20.07.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jun 2025 07:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750430252; x=1751035052; 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=rmgSEfeN8Rj2llj00/Kzt6ONzAD2UZfzQQNsTGfLFsw=; b=ZgxM3jPni/bRTipBHdriDL11w+Ec38jBy4kNXl91GoNZnbgkQtlNHKCHH8bFYrV26/ tdf09h5F9ClNq1PQDD6gRLr/+WKNEf36AIur8SxbPt1QkiRG39l2a4pJ13z7NA06V6E4 kbbdG/XSuB0bdhjtnI+iE9lERvod3M2Em9A4VOPp7onwVdDKMpVdT25uM8jSf+TfFwSV gz+f6TDxwkzUeg6FpVMb+Qp1wNDqRPVsRBPsa4D82DdesrkkQ+vBqWlGbCq8qzSbZXNQ QyyZgoP7B9t18FFHUamVKaSi0R/0V0KOaIzq4htrGsYmxj4st6mk3Ey3FOwYYjpFhL7T GRvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750430252; x=1751035052; 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=rmgSEfeN8Rj2llj00/Kzt6ONzAD2UZfzQQNsTGfLFsw=; b=v0aJjd7NrbWJSC2B1h6Lqw7X3glbIIohkqDVFhjN84TQSge2fupqzVxHVu2XOz6nio igoqERHW/vpqzzt0Z4lnbm+A+2BW4ab7v1K4lr07i5Zxu0HaRtrOE7keECJn0Kq5OaFe zRsPt0WfYF4sl5RVp/mjaXn7IoL5cOczmTgIa2W+8RmvxfJ+k+kwMxN+zeOsDCri1bED TWxl7L3YSEMnNUX4USqhjo5QPlVeNeftsZj4rNopTy7hNu5i0dDfqIMJDYKljxIfe2kA XVnAF7oVR+awY7C9RYehyrWzQRu/7jAo3MMFbyjzUMiDoeDwEs+HwPBi09STLibWyE+A FsZw== X-Gm-Message-State: AOJu0Yyijhq9YEDvISQqAinwx+DjckzMtNBxvZho7AXCRcsN2nBDBXBL 4IGz9hubSPm+2B22lUYlAFX3juGhBmpMJk1dTMZkHRbhsitj7Xotvi+twwqwKV5F2Eu9Iw== X-Gm-Gg: ASbGncv4rMU851ZpYVCg3r7UTja54/jBVhOYP1dWtfifVDc0o0lGJ1Vkgf5Ygr2TS0l lA3Bpm6HGkk2bb5CHLDZ1gTfyoL3Sesmeg9vUKZm5FSL+tXYYA7IHrMi/V2A5prq7jMi6CGruyJ PeKDnFWDlNE3dPksSftDlPDINmqeEi4TXJRqY6Yz4w0jNKlrQwc8W6TRc1TDIWjoM1QiY23bL4f cax8VC5bvfjJ+usWUtFngLW+aJblGqH887lCqrEuS7Nq1/evs/79BbXsSgLaTCg1stb4egn4u05 IyEXaVABg0B0GU3u8yuxzEsGNwAvVWNXCqHjeLG0soSF18QU2dVf9es4rBam7kRm9gyc1sBl X-Google-Smtp-Source: AGHT+IEk5cHIAeMx1rk5pi/nMZube8xkjZVXwrMsrLXfs1uN7epP8x/wRy4qidlNWOTy/DX73mzq0A== X-Received: by 2002:a17:90b:5826:b0:2fe:e9c6:689e with SMTP id 98e67ed59e1d1-3159d64432cmr5389429a91.8.1750430252213; Fri, 20 Jun 2025 07:37:32 -0700 (PDT) From: Tanish Desai To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Mads Ynddal , Tanish Desai Subject: [PATCH v2 3/3] tracetool: remove redundant event_get_state checks Date: Fri, 20 Jun 2025 14:37:20 +0000 Message-Id: <20250620143720.3143-4-tanishdesai37@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250620143720.3143-1-tanishdesai37@gmail.com> References: <20250620143720.3143-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::534; envelope-from=tanishdesai37@gmail.com; helo=mail-pg1-x534.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1750430319414116600 Content-Type: text/plain; charset="utf-8" Moved trace_event_get_state check from _no_check_trace_foo to trace_foo, and removed if (true) checks. The _no_check_trace_foo now only emits backend-specific core logic, avoiding trace event conditionals entirely. This brings conditional logic in format/h.py, reducing duplication across backends and simplifying their code generation.=20 Signed-off-by: Tanish Desai --- scripts/tracetool/backend/ftrace.py | 3 --- scripts/tracetool/backend/log.py | 5 +---- scripts/tracetool/backend/simple.py | 7 +------ scripts/tracetool/backend/syslog.py | 7 +------ scripts/tracetool/format/h.py | 3 ++- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index baed2ae61c..2d6d608add 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -34,18 +34,15 @@ def generate_h(event, group): ' char ftrace_buf[MAX_TRACE_STRLEN];', ' int unused __attribute__ ((unused));', ' int trlen;', - ' if (trace_event_get_state(%(event_id)s)) {', '#line %(event_lineno)d "%(event_filename)s"', ' trlen =3D snprintf(ftrace_buf, MAX_TRACE_STRLEN,', ' "%(name)s " %(fmt)s "\\n" %(argnames= )s);', '#line %(out_next_lineno)d "%(out_filename)s"', ' 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=3Dos.path.relpath(event.filename), fmt=3Devent.fmt.rstrip("\n"), diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index f24acad74c..35a3aeee55 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -31,9 +31,7 @@ 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)) {', ' if (message_with_timestamp) {', ' struct timeval _now;', ' gettimeofday(&_now, NULL);', @@ -49,7 +47,6 @@ def generate_h(event, group): '#line %(out_next_lineno)d "%(out_filename)s"', ' }', ' }', - cond=3Dcond, event_lineno=3Devent.lineno, event_filename=3Dos.path.relpath(event.filename), name=3Devent.name, diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index 7c84c06b20..ce8036f5da 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -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 6fdc1142fb..f84cec641c 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -30,14 +30,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=3Dos.path.relpath(event.filename), name=3Devent.name, diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index 89d54b9aff..7bbe6d3148 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -71,7 +71,8 @@ def generate(events, backend, group): =20 out('}') =20 - cond =3D "true" + event_id =3D 'TRACE_' + e.name.upper() + cond =3D "trace_event_get_state(%s)" % event_id =20 out('', 'static inline void %(api)s(%(args)s)', --=20 2.34.1