From nobody Sun Nov 16 04:02:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598538632; cv=none; d=zohomail.com; s=zohoarc; b=RlKdsftu2x6P+j4GJo7Tzr7dgHrTUJ4XvuFtirl2jyXRGJKNHiN5C4g9O9m488djM3Oo2obphqBvO3qCMy0ujBFq+qfjZtthrZ3Cg2DQAEg+aL6dA7sMHYf53+jfLR3NwkSUj+ySywSaGfr4szNL1OBocNKqKEoBFe9ndlqnxt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598538632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I1r4HAYNFFzPZSB8Htsu4MlRYWdQEYRFFRlgzz+AAs0=; b=BN5HlWiLvsVNZWyODqkrc1kjeN5zIVBP8+jdrCleElPaYg0bp4UcTj276MusD57/XEmnn/pg65pObLjHW7ahSbTfSkQrA7AQ9UGFC55MMca9uhqs/pzH0k1FJYclrxN/Q6B4xKEqAONXBlPOpg4amRw4ckEhlvViJG6JcxPwW3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598538632721173.5349721414825; Thu, 27 Aug 2020 07:30:32 -0700 (PDT) Received: from localhost ([::1]:46854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBIv9-0002oF-E0 for importer@patchew.org; Thu, 27 Aug 2020 10:30:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBIu9-0001UJ-UY for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:29 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26128 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBIu7-0004IF-TF for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:29 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-WrIlhSEePhS_Yvn9nls55A-1; Thu, 27 Aug 2020 10:29:22 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96119AE401; Thu, 27 Aug 2020 14:29:21 +0000 (UTC) Received: from localhost (ovpn-115-8.ams2.redhat.com [10.36.115.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB8DF74E23; Thu, 27 Aug 2020 14:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598538567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I1r4HAYNFFzPZSB8Htsu4MlRYWdQEYRFFRlgzz+AAs0=; b=C8lloM16gqppisJYCA9GUzPpqr1dVfoUY/3Wi3uGEp4vUTJARLbm6zUrcjhgw3YmdZzm3Q wf+FrJysx+Tye5U5SWQ1OhloqImNR63CeySjynY0/QdHMOPcsWfSwJJX+/vw9a4+K0iFlf 6jECf2iDOyoiigjM2IRp77vsbV+Pt7k= X-MC-Unique: WrIlhSEePhS_Yvn9nls55A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 1/4] tracetool: add output filename command-line argument Date: Thu, 27 Aug 2020 15:29:12 +0100 Message-Id: <20200827142915.108730-2-stefanha@redhat.com> In-Reply-To: <20200827142915.108730-1-stefanha@redhat.com> References: <20200827142915.108730-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The tracetool.py script writes to stdout. This means the output filename is not available to the script. Add the output filename to the command-line so that the script has access to the filename. This also simplifies the tracetool.py invocation. It's no longer necessary to use meson's custom_build(capture : true) to save output. Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/tracing.txt | 3 ++- meson.build | 3 +-- scripts/tracetool.py | 12 +++++++----- scripts/tracetool/__init__.py | 18 ++++++++++++++++-- trace/meson.build | 23 ++++++++--------------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index 6144d9921b..c84d4c00ac 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -318,7 +318,8 @@ probes: --target-type system \ --target-name x86_64 \ --group=3Dall \ - trace-events-all >qemu.stp + trace-events-all \ + qemu.stp =20 To facilitate simple usage of systemtap where there merely needs to be pri= ntf logging of certain probes, a helper script "qemu-trace-stap" is provided. diff --git a/meson.build b/meson.build index f0fe5f8799..fadeb0c268 100644 --- a/meson.build +++ b/meson.build @@ -1037,7 +1037,6 @@ foreach target : target_dirs custom_target(exe_name + stp['ext'], input: trace_events_all, output: exe_name + stp['ext'], - capture: true, install: stp['install'], install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', command: [ @@ -1046,7 +1045,7 @@ foreach target : target_dirs '--target-name=3D' + target_name, '--target-type=3D' + target_type, '--probe-prefix=3Dqemu.' + target_type + '.' + tar= get_name, - '@INPUT@', + '@INPUT@', '@OUTPUT@' ]) endforeach endif diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 31146242b7..ab7653a5ce 100644 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -16,7 +16,7 @@ __email__ =3D "stefanha@redhat.com" import sys import getopt =20 -from tracetool import error_write, out +from tracetool import error_write, out, out_open import tracetool.backend import tracetool.format =20 @@ -32,7 +32,7 @@ def error_opt(msg =3D None): format_descr =3D "\n".join([ " %-15s %s" % (n, d) for n,d in tracetool.format.get_list() ]) error_write("""\ -Usage: %(script)s --format=3D --backends=3D [] +Usage: %(script)s --format=3D --backends=3D [] = ... =20 Backends: %(backends)s @@ -135,13 +135,15 @@ def main(args): if probe_prefix is None: probe_prefix =3D ".".join(["qemu", target_type, target_name]) =20 - if len(args) < 1: - error_opt("missing trace-events filepath") + if len(args) < 2: + error_opt("missing trace-events and output filepaths") events =3D [] - for arg in args: + for arg in args[:-1]: with open(arg, "r") as fh: events.extend(tracetool.read_events(fh, arg)) =20 + out_open(args[-1]) + try: tracetool.generate(events, arg_group, arg_format, arg_backends, binary=3Dbinary, probe_prefix=3Dprobe_prefix) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 3ccfa1e116..98104fa50e 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -31,14 +31,28 @@ def error(*lines): sys.exit(1) =20 =20 +out_filename =3D '' +out_fobj =3D sys.stdout + +def out_open(filename): + global out_filename, out_fobj + out_filename =3D filename + out_fobj =3D open(filename, 'wt') + def out(*lines, **kwargs): """Write a set of output lines. =20 You can use kwargs as a shorthand for mapping variables when formating= all the strings in lines. + + The 'out_filename' kwarg is automatically added with the output filena= me. """ - lines =3D [ l % kwargs for l in lines ] - sys.stdout.writelines("\n".join(lines) + "\n") + output =3D [] + for l in lines: + kwargs['out_filename'] =3D out_filename + output.append(l % kwargs) + + out_fobj.writelines("\n".join(output) + "\n") =20 # We only want to allow standard C types or fixed sized # integer types. We don't want QEMU specific types diff --git a/trace/meson.build b/trace/meson.build index 56e870848e..16eccc0c22 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -11,20 +11,17 @@ foreach dir : [ '.' ] + trace_events_subdirs trace_h =3D custom_target(fmt.format('trace', 'h'), output: fmt.format('trace', 'h'), input: trace_events_file, - command: [ tracetool, group, '--format=3Dh', '@I= NPUT@' ], - capture: true) + command: [ tracetool, group, '--format=3Dh', '@I= NPUT@', '@OUTPUT@' ]) genh +=3D trace_h trace_c =3D custom_target(fmt.format('trace', 'c'), output: fmt.format('trace', 'c'), input: trace_events_file, - command: [ tracetool, group, '--format=3Dc', '@I= NPUT@' ], - capture: true) + command: [ tracetool, group, '--format=3Dc', '@I= NPUT@', '@OUTPUT@' ]) if 'CONFIG_TRACE_UST' in config_host trace_ust_h =3D custom_target(fmt.format('trace-ust', 'h'), output: fmt.format('trace-ust', 'h'), input: trace_events_file, - command: [ tracetool, group, '--format=3Du= st-events-h', '@INPUT@' ], - capture: true) + command: [ tracetool, group, '--format=3Du= st-events-h', '@INPUT@', '@OUTPUT@' ]) trace_ss.add(trace_ust_h, lttng, urcubp) genh +=3D trace_ust_h endif @@ -33,8 +30,7 @@ foreach dir : [ '.' ] + trace_events_subdirs trace_dtrace =3D custom_target(fmt.format('trace-dtrace', 'dtrace'), output: fmt.format('trace-dtrace', 'dtrac= e'), input: trace_events_file, - command: [ tracetool, group, '--format=3D= d', '@INPUT@' ], - capture: true) + command: [ tracetool, group, '--format=3D= d', '@INPUT@', '@OUTPUT@' ]) trace_dtrace_h =3D custom_target(fmt.format('trace-dtrace', 'h'), output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, @@ -66,9 +62,8 @@ foreach d : [ gen =3D custom_target(d[0], output: d[0], input: meson.source_root() / 'trace-events', - command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@' ], - build_by_default: true, # to be removed when added to a ta= rget - capture: true) + command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@', '@OUTPUT@' ], + build_by_default: true) # to be removed when added to a ta= rget specific_ss.add(gen) endforeach =20 @@ -76,13 +71,11 @@ if 'CONFIG_TRACE_UST' in config_host trace_ust_all_h =3D custom_target('trace-ust-all.h', output: 'trace-ust-all.h', input: trace_events_files, - command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-h', '@INPUT@' ], - capture: true) + command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-h', '@INPUT@', '@OUTPUT@' ]) trace_ust_all_c =3D custom_target('trace-ust-all.c', output: 'trace-ust-all.c', input: trace_events_files, - command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-c', '@INPUT@' ], - capture: true) + command: [ tracetool, '--group=3Dall', '= --format=3Dust-events-c', '@INPUT@', '@OUTPUT@' ]) trace_ss.add(trace_ust_all_h, trace_ust_all_c) genh +=3D trace_ust_all_h endif --=20 2.26.2 From nobody Sun Nov 16 04:02:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598538719; cv=none; d=zohomail.com; s=zohoarc; b=WkSptedauUdeeAzWZM9VQUbR3vvS2JK0FSOGAJG0ksUbRhBv8dhliMzcu8jro0kKLFL31ccxBfjxMtwHFInWxt3J+9z3MRXDC/qezyzDRyec+tj8vrb3WpkNR9+XpgVWAm7ETDxxHDrRq8eNYLu34MjD9XPtFVCb10UOqh7afcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598538719; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KsReAXs+dPUL8HFnO/3zojF1/6SDvYdyCpVVhkLzaZ4=; b=WlqmJzdBkk+LzsyaWuLANQl/7yG1jgUcnGo1gq1Rhe9RztsqUI3RnHQhUZEcSBREj6M+3Na0ZiNL+Xd8+NLaslyNXToLjBgGZWVo30G9H9fSPQxn8seo8TjgwP4na86IPZYzjiaUxmpjz653XqXOcucs/TjbvNJXKRh8rqY3C4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598538719263875.4623707342914; Thu, 27 Aug 2020 07:31:59 -0700 (PDT) Received: from localhost ([::1]:51290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBIwX-0004hK-Tm for importer@patchew.org; Thu, 27 Aug 2020 10:31:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBIuH-0001lS-Q7 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBIuG-0004J7-4l for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-AhnFzwObOaa3zFkJfHZTHQ-1; Thu, 27 Aug 2020 10:29:27 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 32EF8801AE8; Thu, 27 Aug 2020 14:29:26 +0000 (UTC) Received: from localhost (ovpn-115-8.ams2.redhat.com [10.36.115.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE1F95C1D0; Thu, 27 Aug 2020 14:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598538575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KsReAXs+dPUL8HFnO/3zojF1/6SDvYdyCpVVhkLzaZ4=; b=Xo3i6z1X2qNl7MEPrHdsqQeTztbEL0pqL2Q+eE9d5h8JuuMVn7vuxkVeHLk0VjOheKgrzn cv9Rj+8d8zKbmSZCQGvDkxViFQY0EpLfZCQ1K+7QiuCyDrJOwB702GyqLjpGIutf9ooMek yqMqizRtLqqMhK1Agz1pA1HXYCh2j6Y= X-MC-Unique: AhnFzwObOaa3zFkJfHZTHQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 2/4] tracetool: add out_lineno and out_next_lineno to out() Date: Thu, 27 Aug 2020 15:29:13 +0100 Message-Id: <20200827142915.108730-3-stefanha@redhat.com> In-Reply-To: <20200827142915.108730-1-stefanha@redhat.com> References: <20200827142915.108730-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Make the output file line number and next line number available to out(). A later patch will use this to improve error messages. Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Maydell --- scripts/tracetool/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 98104fa50e..e4ee4d5e61 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -31,6 +31,7 @@ def error(*lines): sys.exit(1) =20 =20 +out_lineno =3D 1 out_filename =3D '' out_fobj =3D sys.stdout =20 @@ -45,12 +46,19 @@ def out(*lines, **kwargs): You can use kwargs as a shorthand for mapping variables when formating= all the strings in lines. =20 - The 'out_filename' kwarg is automatically added with the output filena= me. + The 'out_lineno' kwarg is automatically added to reflect the current o= utput + file line number. The 'out_next_lineno' kwarg is also automatically ad= ded + with the next output line number. The 'out_filename' kwarg is automati= cally + added with the output filename. """ + global out_lineno output =3D [] for l in lines: + kwargs['out_lineno'] =3D out_lineno + kwargs['out_next_lineno'] =3D out_lineno + 1 kwargs['out_filename'] =3D out_filename output.append(l % kwargs) + out_lineno +=3D 1 =20 out_fobj.writelines("\n".join(output) + "\n") =20 --=20 2.26.2 From nobody Sun Nov 16 04:02:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598538821; cv=none; d=zohomail.com; s=zohoarc; b=L3ryo2uxvSs0hLbU5Va5YU2porfmGuV/6+lCvR4WrO/XL/MecvEODTQSoGzfQMI00z4E1oK+4WWv5GbE0tZsxRc2gFwhPio6yxBzGpkJlIv7k8DyqWfIUXYkxE3awJJGg7xrykY7uTsLgSrRrd9X36Ry983uVmbM1xtQw2lqH3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598538821; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ow5mwgYE3lLOnFuNqYI6EDG0/V17MRwun+Vp8JUKo6U=; b=IXH9PKmDFixoSsuus4YHpJUrYwcmfWXpIYygrJP1k/A10Qri1ExGsyZs663pga63RqhdeXwbsSlXSl0CMj4Atf3HsN6PBEl2zVIyG+UBCsluhI0m9EVNr+ot7KUoXTf1fX/mfVwSBifdJOTl1hK/53Rl3S32Oed5grHUQWaumyY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598538821436790.8018514293813; Thu, 27 Aug 2020 07:33:41 -0700 (PDT) Received: from localhost ([::1]:56654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBIyC-0006ww-1d for importer@patchew.org; Thu, 27 Aug 2020 10:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBIuI-0001ny-Ud for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33899 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBIuH-0004JI-3W for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:38 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-0_xU3S25MquERHyalKKaIA-1; Thu, 27 Aug 2020 10:29:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 947CEAE400; Thu, 27 Aug 2020 14:29:30 +0000 (UTC) Received: from localhost (ovpn-115-8.ams2.redhat.com [10.36.115.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 860F66198B; Thu, 27 Aug 2020 14:29:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598538576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ow5mwgYE3lLOnFuNqYI6EDG0/V17MRwun+Vp8JUKo6U=; b=g8O4gqoAgCi6AmlW79rW+oarqLxQf74Q/rWx6mxPa5P95QKNX2ZhUuKS85XK+RxDqwehCg Mqpp3rjJ0GTuIJIPcbIMcaUJQtF1Xa6gsoDPlnkOm6shPE51PHbdSHi+CwmAzu9cnRn7OX SXNS+WARUWKlv3wnd16IR63PR54y3gg= X-MC-Unique: 0_xU3S25MquERHyalKKaIA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 3/4] tracetool: add input filename and line number to Event Date: Thu, 27 Aug 2020 15:29:14 +0100 Message-Id: <20200827142915.108730-4-stefanha@redhat.com> In-Reply-To: <20200827142915.108730-1-stefanha@redhat.com> References: <20200827142915.108730-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Store the input filename and line number in Event. A later patch will use this to improve error messages. Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/tracetool/__init__.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index e4ee4d5e61..1a6e2fa64a 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -218,6 +218,10 @@ class Event(object): Properties of the event. args : Arguments The event arguments. + lineno : int + The line number in the input file. + filename : str + The path to the input file. =20 """ =20 @@ -230,7 +234,7 @@ class Event(object): =20 _VALID_PROPS =3D set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu= "]) =20 - def __init__(self, name, props, fmt, args, orig=3DNone, + def __init__(self, name, props, fmt, args, lineno, filename, orig=3DNo= ne, event_trans=3DNone, event_exec=3DNone): """ Parameters @@ -243,6 +247,10 @@ class Event(object): Event printing format string(s). args : Arguments Event arguments. + lineno : int + The line number in the input file. + filename : str + The path to the input file. orig : Event or None Original Event before transformation/generation. event_trans : Event or None @@ -255,6 +263,8 @@ class Event(object): self.properties =3D props self.fmt =3D fmt self.args =3D args + self.lineno =3D int(lineno) + self.filename =3D str(filename) self.event_trans =3D event_trans self.event_exec =3D event_exec =20 @@ -276,16 +286,21 @@ class Event(object): def copy(self): """Create a new copy.""" return Event(self.name, list(self.properties), self.fmt, - self.args.copy(), self, self.event_trans, self.event_= exec) + self.args.copy(), self.lineno, self.filename, + self, self.event_trans, self.event_exec) =20 @staticmethod - def build(line_str): + def build(line_str, lineno, filename): """Build an Event instance from a string. =20 Parameters ---------- line_str : str Line describing the event. + lineno : int + Line number in input file. + filename : str + Path to input file. """ m =3D Event._CRE.match(line_str) assert m is not None @@ -315,7 +330,7 @@ class Event(object): if "tcg" in props and isinstance(fmt, str): raise ValueError("Events with 'tcg' property must have two for= mat strings") =20 - event =3D Event(name, props, fmt, args) + event =3D Event(name, props, fmt, args, lineno, filename) =20 # add implicit arguments when using the 'vcpu' property import tracetool.vcpu @@ -360,6 +375,8 @@ class Event(object): list(self.properties), self.fmt, self.args.transform(*trans), + self.lineno, + self.filename, self) =20 =20 @@ -386,7 +403,7 @@ def read_events(fobj, fname): continue =20 try: - event =3D Event.build(line) + event =3D Event.build(line, lineno, fname) except ValueError as e: arg0 =3D 'Error at %s:%d: %s' % (fname, lineno, e.args[0]) e.args =3D (arg0,) + e.args[1:] --=20 2.26.2 From nobody Sun Nov 16 04:02:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598538735; cv=none; d=zohomail.com; s=zohoarc; b=ZNAGKp+FmXFbZqWxoFC0OuaOBbPN2F3cMEBXFo9WQGK/hE+X2bp5RooBC3HLlN4xWazvqAjyh4dLHNKaI47mat52O2NKrvcHm5L9DQGVOm+UeqJj1VTbn+1LirjAHWwAm8sxVwm/N1XspsqZqzZAqN55p+uPhBnlJlHybwmqhSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598538735; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MjO/UPdB4O1n8iYVXF2z8DOoNo+23LLam4UaqokY/cE=; b=Rhkd//BHn2fKCiU5xjjqT97pvRPNxYVthk/9Zg70AxxCMDBMyfo+QHYSTLEnxIGeH1s74Z9YpFmuxsGKbyYUrNtIA0ZMQoZlpCl6eC43BBFO3CSmA9HDIBxg0PIf4n/fFfFK220p5piwj+/sDzpMw+KRjM7vmpL93AXM//5NJIA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159853873526356.7200168906146; Thu, 27 Aug 2020 07:32:15 -0700 (PDT) Received: from localhost ([::1]:52028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBIwo-0004zp-0K for importer@patchew.org; Thu, 27 Aug 2020 10:32:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBIuK-0001rp-Gf for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:40 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53589 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBIuI-0004JV-K1 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 10:29:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-mc1YU59MMXCgG30ldzo2OA-1; Thu, 27 Aug 2020 10:29:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82EEE801AC2; Thu, 27 Aug 2020 14:29:32 +0000 (UTC) Received: from localhost (ovpn-115-8.ams2.redhat.com [10.36.115.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10CAC60FC2; Thu, 27 Aug 2020 14:29:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598538577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjO/UPdB4O1n8iYVXF2z8DOoNo+23LLam4UaqokY/cE=; b=JgtqWCzqSf4dg2pP6KBFidKFpm+NPMJijv9AWe4cdKiHhNDd1yL/S4L9hrhtYaThtEA71H Vzp0+7w+JhLTpTkvzIS7p4nIs4QX7ta6dKv0uDzfyaj2rvtZdYbNP5tW5dJIR83T5CLY6T qhgLEaYP4GEn3fdvJlEQcIg3OZs/m0U= X-MC-Unique: mc1YU59MMXCgG30ldzo2OA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 4/4] tracetool: show trace-events filename/lineno in fmt string errors Date: Thu, 27 Aug 2020 15:29:15 +0100 Message-Id: <20200827142915.108730-5-stefanha@redhat.com> In-Reply-To: <20200827142915.108730-1-stefanha@redhat.com> References: <20200827142915.108730-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com 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=207.211.31.81; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Stefan Hajnoczi , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The compiler encounters trace event format strings in generated code. Format strings are error-prone and therefore clear compiler errors are important. Use the #line directive to show the trace-events filename and line number in format string errors: https://gcc.gnu.org/onlinedocs/gcc-10.2.0/cpp/Line-Control.html For example, if the cpu_in trace event's %u is changed to %p the following error is reported: trace-events:29:18: error: format =E2=80=98%p=E2=80=99 expects argument o= f type =E2=80=98void *=E2=80=99, but argument 7 has type =E2=80=98unsigned = int=E2=80=99 [-Werror=3Dformat=3D] Line 29 in trace-events is where cpu_in is defined. This works for any trace-events file in the QEMU source tree and the correct path is displayed. Unfortunately there does not seem to be a way to set the column, so "18" is not the right character on that line. Suggested-by: Peter Maydell Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Maydell --- scripts/tracetool/backend/ftrace.py | 4 ++++ scripts/tracetool/backend/log.py | 4 ++++ scripts/tracetool/backend/syslog.py | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backen= d/ftrace.py index e9844dd335..5fa30ccc08 100644 --- a/scripts/tracetool/backend/ftrace.py +++ b/scripts/tracetool/backend/ftrace.py @@ -33,8 +33,10 @@ def generate_h(event, group): ' 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);= ', ' }', @@ -42,6 +44,8 @@ def generate_h(event, group): 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"), argnames=3Dargnames) =20 diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index 877222bbe9..bc43dbb4f4 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -37,12 +37,16 @@ def generate_h(event, group): out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', ' struct timeval _now;', ' gettimeofday(&_now, NULL);', + '#line %(event_lineno)d "%(event_filename)s"', ' qemu_log("%%d@%%zu.%%06zu:%(name)s " %(fmt)s "\\n",', ' qemu_get_thread_id(),', ' (size_t)_now.tv_sec, (size_t)_now.tv_usec', ' %(argnames)s);', + '#line %(out_next_lineno)d "%(out_filename)s"', ' }', cond=3Dcond, + event_lineno=3Devent.lineno, + event_filename=3Devent.filename, name=3Devent.name, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backen= d/syslog.py index 1373a90192..5a3a00fe31 100644 --- a/scripts/tracetool/backend/syslog.py +++ b/scripts/tracetool/backend/syslog.py @@ -35,9 +35,13 @@ def generate_h(event, group): cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) =20 out(' if (%(cond)s) {', + '#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, fmt=3Devent.fmt.rstrip("\n"), argnames=3Dargnames) --=20 2.26.2