From nobody Sun Nov 16 05:40:48 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