From nobody Sat Apr 27 18:38:27 2024 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 1501249101060811.8970384974722; Fri, 28 Jul 2017 06:38:21 -0700 (PDT) Received: from localhost ([::1]:48434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5T8-0008H3-Ga for importer@patchew.org; Fri, 28 Jul 2017 09:38:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5Rz-0007hl-Vi for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:37:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db5Rx-0002NJ-0C for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:37:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56342) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db5Rw-0002MI-Lo for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:37:04 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3953CE388 for ; Fri, 28 Jul 2017 13:37:03 +0000 (UTC) Received: from t460.redhat.com (ovpn-117-113.ams2.redhat.com [10.36.117.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E9AB6FE78; Fri, 28 Jul 2017 13:36:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A3953CE388 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 14:36:57 +0100 Message-Id: <20170728133657.5525-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 28 Jul 2017 13:37:03 +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] [PATCH for 2.10] trace: ensure unique function / variable names per .stp file 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: 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" The simpletrace compatibility code for systemtap creates a function and some global variables for mapping to event ID numbers. We generate multiple -simpletrace.stp files though, one per target and systemtap considers functions & variables to be globally scoped, not per file. So if trying to use the simpletrace compat probes, systemtap will complain: # stap -e 'probe qemu.system.arm.simpletrace.visit_type_str { print( "hell= o")}' semantic error: conflicting global variables: identifier 'event_name_to_id= _map' at /usr/share/systemtap/tapset/qemu-aarch64-simpletrace.stp:3:8 source: global event_name_to_id_map ^ identifier 'event_name_to_id_map' at /usr/share/systemtap/tapset/qemu-syst= em-arm-simpletrace.stp:3:8 source: global event_name_to_id_map ^ WARNING: cross-file global variable reference to identifier 'event_name_to= _id_map' at /usr/share/systemtap/tapset/qemu-system-arm-simpletrace.stp:3:8= from: identifier 'event_name_to_id_map' at /usr/share/systemtap/tapset/qem= u-aarch64-simpletrace.stp:8:21 source: if (!([name] in event_name_to_id_map)) { ^ WARNING: cross-file global variable reference to identifier 'event_next_id= ' at /usr/share/systemtap/tapset/qemu-system-arm-simpletrace.stp:4:8 from: = identifier 'event_next_id' at :9:38 source: event_name_to_id_map[name] =3D event_next_id ^ We already have a string used to prefix probe names, so just replace '.' with '_' to get a function / variable name prefix Signed-off-by: Daniel P. Berrange --- scripts/tracetool/format/simpletrace_stap.py | 29 ++++++++++++++++++------= ---- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/scripts/tracetool/format/simpletrace_stap.py b/scripts/traceto= ol/format/simpletrace_stap.py index c35e662e00..144b704bcd 100644 --- a/scripts/tracetool/format/simpletrace_stap.py +++ b/scripts/tracetool/format/simpletrace_stap.py @@ -18,29 +18,37 @@ from tracetool.backend.dtrace import binary, probeprefix from tracetool.backend.simple import is_string from tracetool.format.stap import stap_escape =20 +def global_var_name(name): + return probeprefix().replace(".", "_") + "_" + name =20 def generate(events, backend, group): + id_map =3D global_var_name("event_name_to_id_map") + next_id =3D global_var_name("event_next_id") + map_func =3D global_var_name("simple_trace_map_event") out('/* This file is autogenerated by tracetool, do not edit. */', '', - 'global event_name_to_id_map', - 'global event_next_id', - 'function simple_trace_map_event(name)', + 'global %(id_map)s', + 'global %(next_id)s', + 'function %(map_func)s(name)', '', '{', - ' if (!([name] in event_name_to_id_map)) {', - ' event_name_to_id_map[name] =3D event_next_id', + ' if (!([name] in %(id_map)s)) {', + ' %(id_map)s[name] =3D %(next_id)s', ' name_len =3D strlen(name)', ' printf("%%8b%%8b%%4b%%.*s", 0, ', - ' event_next_id, name_len, name_len, name)', - ' event_next_id =3D event_next_id + 1', + ' %(next_id)s, name_len, name_len, name)', + ' %(next_id)s =3D %(next_id)s + 1', ' }', - ' return event_name_to_id_map[name]', + ' return %(id_map)s[name]', '}', 'probe begin', '{', ' printf("%%8b%%8b%%8b", 0xffffffffffffffff, 0xf2b177cb0aa429b4= , 4)', '}', - '') + '', + id_map=3Did_map, + next_id=3Dnext_id, + map_func=3Dmap_func) =20 for event_id, e in enumerate(events): if 'disable' in e.properties: @@ -48,8 +56,9 @@ def generate(events, backend, group): =20 out('probe %(probeprefix)s.simpletrace.%(name)s =3D %(probeprefix)= s.%(name)s ?', '{', - ' id =3D simple_trace_map_event("%(name)s")', + ' id =3D %(map_func)s("%(name)s")', probeprefix=3Dprobeprefix(), + map_func=3Dmap_func, name=3De.name) =20 # Calculate record size --=20 2.13.3