From nobody Mon Feb 9 19:53:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501593524335337.5598932066615; Tue, 1 Aug 2017 06:18:44 -0700 (PDT) Received: from localhost ([::1]:42521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcX4L-0002ln-Tf for importer@patchew.org; Tue, 01 Aug 2017 09:18:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dcX2O-0001bB-UR for qemu-devel@nongnu.org; Tue, 01 Aug 2017 09:16:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dcX2K-0005S6-Ss for qemu-devel@nongnu.org; Tue, 01 Aug 2017 09:16:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dcX2K-0005Rk-Jy for qemu-devel@nongnu.org; Tue, 01 Aug 2017 09:16:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CE1B3BB82A; Tue, 1 Aug 2017 13:16:35 +0000 (UTC) Received: from localhost (ovpn-117-109.ams2.redhat.com [10.36.117.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A72217CEC; Tue, 1 Aug 2017 13:16:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5CE1B3BB82A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=stefanha@redhat.com From: Stefan Hajnoczi To: Date: Tue, 1 Aug 2017 14:16:12 +0100 Message-Id: <20170801131618.27332-4-stefanha@redhat.com> In-Reply-To: <20170801131618.27332-1-stefanha@redhat.com> References: <20170801131618.27332-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 01 Aug 2017 13:16:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/9] trace: add TRACE__BACKEND_DSTATE() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU keeps track of trace event enabled/disabled state and provides monitor commands to inspect and modify the "dstate". SystemTap and LTTng UST maintain independent enabled/disabled states for each trace event, the other backends rely on QEMU dstate. Introduce a new per-event macro that combines backend-specific dstate like this: #define TRACE_MY_EVENT_BACKEND_DSTATE() ( \ QEMU_MY_EVENT_ENABLED() || /* SystemTap */ \ tracepoint_enabled(qemu, my_event) /* LTTng UST */ || \ false) This will be used to extend trace_event_get_state() in the next patch. [Daniel Berrange pointed out that QEMU_MY_EVENT_ENABLED() must be true by default, not false. This way events will fire even if the DTrace implementation does not implement the SystemTap semaphores feature. Ubuntu Precise uses lttng-ust-dev 2.0.2 which does not have tracepoint_enabled(), so we need a compatibility wrapper to keep Travis builds passing. --Stefan] Signed-off-by: Stefan Hajnoczi Message-id: 20170731140718.22010-2-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi fixup! trace: add TRACE__BACKEND_DSTATE() --- scripts/tracetool/__init__.py | 1 + scripts/tracetool/backend/__init__.py | 3 +++ scripts/tracetool/backend/dtrace.py | 12 ++++++++++++ scripts/tracetool/backend/ftrace.py | 5 +++++ scripts/tracetool/backend/log.py | 5 +++++ scripts/tracetool/backend/simple.py | 5 +++++ scripts/tracetool/backend/syslog.py | 5 +++++ scripts/tracetool/backend/ust.py | 10 ++++++++++ scripts/tracetool/format/h.py | 10 ++++++++++ 9 files changed, 56 insertions(+) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index d4c204a472..0670ec17d5 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -271,6 +271,7 @@ class Event(object): QEMU_TRACE_NOCHECK =3D "_nocheck__" + QEMU_TRACE QEMU_TRACE_TCG =3D QEMU_TRACE + "_tcg" QEMU_DSTATE =3D "_TRACE_%(NAME)s_DSTATE" + QEMU_BACKEND_DSTATE =3D "TRACE_%(NAME)s_BACKEND_DSTATE" QEMU_EVENT =3D "_TRACE_%(NAME)s_EVENT" =20 def api(self, fmt=3DNone): diff --git a/scripts/tracetool/backend/__init__.py b/scripts/tracetool/back= end/__init__.py index f735a259c0..259c6a6531 100644 --- a/scripts/tracetool/backend/__init__.py +++ b/scripts/tracetool/backend/__init__.py @@ -119,5 +119,8 @@ class Wrapper: def generate(self, event, group): self._run_function("generate_%s", event, group) =20 + def generate_backend_dstate(self, event, group): + self._run_function("generate_%s_backend_dstate", event, group) + def generate_end(self, events, group): self._run_function("generate_%s_end", events, group) diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backen= d/dtrace.py index c6812b70a2..c2f3a4e5a8 100644 --- a/scripts/tracetool/backend/dtrace.py +++ b/scripts/tracetool/backend/dtrace.py @@ -44,8 +44,20 @@ def generate_h_begin(events, group): out('#include "%s"' % header, '') =20 + # SystemTap defines __ENABLED() but other DTrace + # implementations might not. + for e in events: + out('#ifndef QEMU_%(uppername)s_ENABLED', + '#define QEMU_%(uppername)s_ENABLED() true', + '#endif', + uppername=3De.name.upper()) =20 def generate_h(event, group): out(' QEMU_%(uppername)s(%(argnames)s);', uppername=3Devent.name.upper(), argnames=3D", ".join(event.args.names())) + + +def generate_h_backend_dstate(event, group): + out(' QEMU_%(uppername)s_ENABLED() || \\', + uppername=3Devent.name.upper()) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index dd0eda4441..92f71b28f9 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -45,3 +45,8 @@ def generate_h(event, group): event_id=3D"TRACE_" + event.name.upper(), fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) + + +def generate_h_backend_dstate(event, group): + out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', + event_id=3D"TRACE_" + event.name.upper()) diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 54f0a69886..da86f6b882 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -48,3 +48,8 @@ def generate_h(event, group): name=3Devent.name, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) + + +def generate_h_backend_dstate(event, group): + out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', + event_id=3D"TRACE_" + event.name.upper()) diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backen= d/simple.py index f983670ee1..c2fd1c24c4 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -42,6 +42,11 @@ def generate_h(event, group): args=3D", ".join(event.args.names())) =20 =20 +def generate_h_backend_dstate(event, group): + out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', + event_id=3D"TRACE_" + event.name.upper()) + + def generate_c_begin(events, group): out('#include "qemu/osdep.h"', '#include "trace/control.h"', diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 1ce627f0fc..668fb73fee 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -42,3 +42,8 @@ def generate_h(event, group): name=3Devent.name, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) + + +def generate_h_backend_dstate(event, group): + out(' trace_event_get_state_dynamic_by_id(%(event_id)s) || \\', + event_id=3D"TRACE_" + event.name.upper()) diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/u= st.py index 2adaf548d5..280cb7c106 100644 --- a/scripts/tracetool/backend/ust.py +++ b/scripts/tracetool/backend/ust.py @@ -27,6 +27,11 @@ def generate_h_begin(events, group): =20 out('#include ', '#include "%s"' % header, + '', + '/* tracepoint_enabled() was introduced in LTTng UST 2.7 */', + '#ifndef tracepoint_enabled', + '#define tracepoint_enabled(a, b) true', + '#endif', '') =20 =20 @@ -38,3 +43,8 @@ def generate_h(event, group): out(' tracepoint(qemu, %(name)s%(tp_args)s);', name=3Devent.name, tp_args=3Dargnames) + + +def generate_h_backend_dstate(event, group): + out(' tracepoint_enabled(qemu, %(name)s) || \\', + name=3Devent.name) diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py index aecf249d66..e06f0f27c5 100644 --- a/scripts/tracetool/format/h.py +++ b/scripts/tracetool/format/h.py @@ -49,6 +49,16 @@ def generate(events, backend, group): backend.generate_begin(events, group) =20 for e in events: + # tracer-specific dstate + out('', + '#define %(api)s() ( \\', + api=3De.api(e.QEMU_BACKEND_DSTATE)) + + if "disable" not in e.properties: + backend.generate_backend_dstate(e, group) + + out(' false)') + # tracer without checks out('', 'static inline void %(api)s(%(args)s)', --=20 2.13.3