From patchwork Mon Jan 25 11:35:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1431155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NtZtAs+h; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPSYD4SkTz9s2g for ; Mon, 25 Jan 2021 22:38:24 +1100 (AEDT) Received: from localhost ([::1]:45420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l40CM-0005TG-HZ for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 06:38:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l409W-0003hM-OQ for qemu-devel@nongnu.org; Mon, 25 Jan 2021 06:35:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l409S-0002wk-9x for qemu-devel@nongnu.org; Mon, 25 Jan 2021 06:35:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611574520; 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=cOf6nyTPlnRdfmzFb5l/dVpj2lJO2PQriUoXwJgsSww=; b=NtZtAs+h1uFEehz+9psf1TuLl4YMkFr2Na8ksI7Kol7QmNCY7Jf1PoyEL+KKmSIw4VCPVt VHD5lD0hLr27ZYQRif9BQVxjRolrm6tejrHK3WbitK/cTMxoAJEpI6OqWTuoAwltECuS7f B9G4KAoG2BBY5qQEDqkFlb1UJb+YXi8= 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-569-g9K9yMISNhGruR3bKhdkGg-1; Mon, 25 Jan 2021 06:35:18 -0500 X-MC-Unique: g9K9yMISNhGruR3bKhdkGg-1 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 994F7803624; Mon, 25 Jan 2021 11:35:17 +0000 (UTC) Received: from localhost (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37D185C737; Mon, 25 Jan 2021 11:35:14 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 1/2] error: rename error_with_timestamp to message_with_timestamp Date: Mon, 25 Jan 2021 11:35:06 +0000 Message-Id: <20210125113507.224287-2-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.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 X-Mimecast-Originator: redhat.com 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The -msg timestamp=on|off option controls whether a timestamp is printed with error_report() messages. The "-msg" name suggests that this option has a wider effect than just error_report(). The next patch extends it to the 'log' trace backend, so rename the variable from error_with_timestamp to message_with_timestamp. Signed-off-by: Stefan Hajnoczi --- include/qemu/error-report.h | 2 +- softmmu/vl.c | 2 +- util/qemu-error.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index a5ad95ff1b..9d197daca3 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -74,7 +74,7 @@ void error_init(const char *argv0); const char *error_get_progname(void); -extern bool error_with_timestamp; +extern bool message_with_timestamp; extern bool error_with_guestname; extern const char *error_guest_name; diff --git a/softmmu/vl.c b/softmmu/vl.c index a8876b8965..bd55468669 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -737,7 +737,7 @@ static void realtime_init(void) static void configure_msg(QemuOpts *opts) { - error_with_timestamp = qemu_opt_get_bool(opts, "timestamp", false); + message_with_timestamp = qemu_opt_get_bool(opts, "timestamp", false); error_with_guestname = qemu_opt_get_bool(opts, "guest-name", false); } diff --git a/util/qemu-error.c b/util/qemu-error.c index aa30f03564..52a9e013c4 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -25,7 +25,7 @@ typedef enum { } report_type; /* Prepend timestamp to messages */ -bool error_with_timestamp; +bool message_with_timestamp; bool error_with_guestname; const char *error_guest_name; @@ -208,7 +208,7 @@ static void vreport(report_type type, const char *fmt, va_list ap) GTimeVal tv; gchar *timestr; - if (error_with_timestamp && !monitor_cur()) { + if (message_with_timestamp && !monitor_cur()) { g_get_current_time(&tv); timestr = g_time_val_to_iso8601(&tv); error_printf("%s ", timestr); From patchwork Mon Jan 25 11:35:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1431154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AApiR6Y+; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPSVp5RyTz9s2g for ; Mon, 25 Jan 2021 22:36:18 +1100 (AEDT) Received: from localhost ([::1]:41704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l40AK-0003lR-C0 for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 06:36:16 -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 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= 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 X-MC-Unique: kIVCh70wOmymI9mLnSpGbA-1 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) 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Timestamps in tracing output can be distracting. Make it possible to control tid/timestamp printing with -msg timestamp=on|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 that uses DPRINTF(). +The -msg timestamp=on|off command-line option controls whether or not to print +the tid/timestamp prefix for each trace event. + === Simpletrace === The "simple" backend supports common use cases and comes as part of the QEMU diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py index bc43dbb4f4..17ba1cd90e 100644 --- a/scripts/tracetool/backend/log.py +++ b/scripts/tracetool/backend/log.py @@ -20,6 +20,7 @@ PUBLIC = True def generate_h_begin(events, group): out('#include "qemu/log-for-trace.h"', + '#include "qemu/error-report.h"', '') @@ -35,14 +36,20 @@ def generate_h(event, group): cond = "trace_event_get_state(%s)" % ("TRACE_" + event.name.upper()) 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=cond, event_lineno=event.lineno,