From nobody Mon Feb 9 18:45:41 2026 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=1611574613; cv=none; d=zohomail.com; s=zohoarc; b=h3yEuTM8ZXgTDN46g77kIeS9kggoEotNjkdZ7jpyliKbASeu/U2OTcmVMadd9ePe/SOdA3aR3wAM8pykL2DZcADBVN5eUKwKTdaDy6dWhJmUZwHa38nCwm6QmYfN2Hn3Dtw9oQfHxSTdeAndVYklXg1gqoHk2E3n71Zid7pm5oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611574613; 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=d/aykXlkLd0n8nnI15viAOdgTCd1N6P/sSNIwLhHXec=; b=k+aiAd04dItsi/8WIyMWrRU/i6xLf5+g/G4Ig/yl9Y5uSrdrIFYR9yCx0cm+Ifyce7hmdzQJ4YUKlssXfPU8zKrdgzLDnTsf9rvz9kvXUSnR8WchVyp2UksfNNJQLyS9bnRiBhCUpJSdeOhvEr40EuORZoHzm1Jz8B9FqJxqIqM= 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 1611574613763359.5471497950765; Mon, 25 Jan 2021 03:36:53 -0800 (PST) Received: from localhost ([::1]:43650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l40Au-0004gn-OM for importer@patchew.org; Mon, 25 Jan 2021 06:36:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l409Z-0003kF-Hq for qemu-devel@nongnu.org; Mon, 25 Jan 2021 06:35:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l409X-0002zr-Sh for qemu-devel@nongnu.org; Mon, 25 Jan 2021 06:35:29 -0500 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-131-kIVCh70wOmymI9mLnSpGbA-1; Mon, 25 Jan 2021 06:35:23 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 977F7107ACE6; Mon, 25 Jan 2021 11:35:22 +0000 (UTC) Received: from localhost (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id C705D19727; Mon, 25 Jan 2021 11:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611574527; 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=d/aykXlkLd0n8nnI15viAOdgTCd1N6P/sSNIwLhHXec=; b=AApiR6Y+rtDiGktzA6zLbHLHF0OXPzvzl901q3DUc0AdGxrFsjNtuqtPjcCQPa7P3I0PlV mnMDEDcujTJTjoqBOH+TxGeWVxEyvWy2VLDlgWaTUV3xDUDZqN2JEB7YYREyOoEhfACm8I w9kZ8AYxoa9s76qN169nSqibrh1phzs= X-MC-Unique: kIVCh70wOmymI9mLnSpGbA-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 2/2] trace: make the 'log' backend timestamp configurable Date: Mon, 25 Jan 2021 11:35:07 +0000 Message-Id: <20210125113507.224287-3-stefanha@redhat.com> In-Reply-To: <20210125113507.224287-1-stefanha@redhat.com> References: <20210125113507.224287-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 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=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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.25, 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_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Paolo Bonzini , Daniel Berrange , Markus Armbruster , Stefan Hajnoczi 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" Timestamps in tracing output can be distracting. Make it possible to control tid/timestamp printing with -msg timestamp=3Don|off. The default is no tid/timestamps. Previously they were always printed. Suggested-by: BALATON Zoltan Signed-off-by: Stefan Hajnoczi --- docs/devel/tracing.txt | 3 +++ scripts/tracetool/backend/log.py | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index dba43fc7a4..cd744c0429 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -211,6 +211,9 @@ effectively turns trace events into debug printfs. This is the simplest backend and can be used together with existing code t= hat uses DPRINTF(). =20 +The -msg timestamp=3Don|off command-line option controls whether or not to= print +the tid/timestamp prefix for each trace event. + =3D=3D=3D Simpletrace =3D=3D=3D =20 The "simple" backend supports common use cases and comes as part of the QE= MU diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/l= og.py index bc43dbb4f4..17ba1cd90e 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,6 +20,7 @@ PUBLIC =3D True =20 def generate_h_begin(events, group): out('#include "qemu/log-for-trace.h"', + '#include "qemu/error-report.h"', '') =20 =20 @@ -35,14 +36,20 @@ def generate_h(event, group): cond =3D "trace_event_get_state(%s)" % ("TRACE_" + event.name.uppe= r()) =20 out(' if (%(cond)s && qemu_loglevel_mask(LOG_TRACE)) {', - ' struct timeval _now;', - ' gettimeofday(&_now, NULL);', + ' if (message_with_timestamp) {', + ' 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);', + ' 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"', + ' } else {', + '#line %(event_lineno)d "%(event_filename)s"', + ' qemu_log("%(name)s " %(fmt)s "\\n"%(argnames)s);', + '#line %(out_next_lineno)d "%(out_filename)s"', + ' }', ' }', cond=3Dcond, event_lineno=3Devent.lineno, --=20 2.29.2