From nobody Mon Feb 9 01:19:57 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=1620211576; cv=none; d=zohomail.com; s=zohoarc; b=Uw67oNTb4A2tGFuTdDjNXF/Nyma+VNUT4L8Wpa+lGYMvskiU08ay4bXWmpFBxpn7ibR2wDwkwtwvPp1ZYVSSep0J4DPsmWYX+A4HcLKEZ1zkSLgAv5dXCbC7SEtFVYoSZFuKdhPWsbDueYSedWCNbuuffDm1ltuBD84TOCdkPNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620211576; 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=zuNHPGs9m/WWfUU6/EY/+dbFSrd7g9G6+sv/t5XFvOQ=; b=Ly1sVYSNkkClK1SLgYMQ0DfM1ozy21XNE6B0WcbK+A4/QgsmiJo7jCwTPf7u9eJflzlZGz8rgkYuYRn/8pNQxDXUPiW+L+c0ED/Vlk0aWsC4z2qYvkHaof9lCI/ZjllyFSVdq5pjSyWT9NINTvF3aL1Soah5uRJJv17J+CyNky4= 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 1620211576141261.3423207719412; Wed, 5 May 2021 03:46:16 -0700 (PDT) Received: from localhost ([::1]:54332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leF2k-00022q-VA for importer@patchew.org; Wed, 05 May 2021 06:46:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leEvL-0001wF-NG for qemu-devel@nongnu.org; Wed, 05 May 2021 06:38:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leEvH-0007tr-2e for qemu-devel@nongnu.org; Wed, 05 May 2021 06:38:35 -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-495-gR-RP_BTN1-b7VXP-7zS6w-1; Wed, 05 May 2021 06:38:26 -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 A2763188E3C2; Wed, 5 May 2021 10:38:25 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-114-253.ams2.redhat.com [10.36.114.253]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0E5C58821; Wed, 5 May 2021 10:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620211110; 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=zuNHPGs9m/WWfUU6/EY/+dbFSrd7g9G6+sv/t5XFvOQ=; b=YBsO6iHAxQnmlYyF8t2TaIDyyNwYYXS6yo1doH0NKLSYyfkrPf9xQBvGAV6RwPJXD610nE zjFvJNdN/vP7tWC2niKYZP3VMqVbPSbPiPp6gFs9DVIKndfUMIDT/zwzF7EWt7Gbr+7eYl uctq035kux7zpOJssXc5OIiO0LOrWaU= X-MC-Unique: gR-RP_BTN1-b7VXP-7zS6w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/7] virtiofsd: use GDateTime for formatting timestamp for debug messages Date: Wed, 5 May 2021 11:37:02 +0100 Message-Id: <20210505103702.521457-8-berrange@redhat.com> In-Reply-To: <20210505103702.521457-1-berrange@redhat.com> References: <20210505103702.521457-1-berrange@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=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Kevin Wolf , Jiri Pirko , qemu-block@nongnu.org, Juan Quintela , Markus Armbruster , Jason Wang , Laurent Vivier , Max Reitz , virtio-fs@redhat.com, Gerd Hoffmann , Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Brad Smith Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The GDateTime APIs provided by GLib avoid portability pitfalls, such as some platforms where 'struct timeval.tv_sec' field is still 'long' instead of 'time_t'. When combined with automatic cleanup, GDateTime often results in simpler code too. Signed-off-by: Daniel P. Berrang=C3=A9 --- tools/virtiofsd/passthrough_ll.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 1553d2ef45..cdd224918c 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -3558,10 +3558,6 @@ static void setup_nofile_rlimit(unsigned long rlimit= _nofile) static void log_func(enum fuse_log_level level, const char *fmt, va_list a= p) { g_autofree char *localfmt =3D NULL; - struct timespec ts; - struct tm tm; - char sec_fmt[sizeof "2020-12-07 18:17:54"]; - char zone_fmt[sizeof "+0100"]; =20 if (current_log_level < level) { return; @@ -3573,23 +3569,10 @@ static void log_func(enum fuse_log_level level, con= st char *fmt, va_list ap) localfmt =3D g_strdup_printf("[ID: %08ld] %s", syscall(__NR_ge= ttid), fmt); } else { - /* try formatting a broken-down timestamp */ - if (clock_gettime(CLOCK_REALTIME, &ts) !=3D -1 && - localtime_r(&ts.tv_sec, &tm) !=3D NULL && - strftime(sec_fmt, sizeof sec_fmt, "%Y-%m-%d %H:%M:%S", - &tm) !=3D 0 && - strftime(zone_fmt, sizeof zone_fmt, "%z", &tm) !=3D 0) { - localfmt =3D g_strdup_printf("[%s.%02ld%s] [ID: %08ld] %s", - sec_fmt, - ts.tv_nsec / (10L * 1000 * 1000= ), - zone_fmt, syscall(__NR_gettid), - fmt); - } else { - /* fall back to a flat timestamp */ - localfmt =3D g_strdup_printf("[%" PRId64 "] [ID: %08ld] %s= ", - get_clock(), syscall(__NR_getti= d), - fmt); - } + g_autoptr(GDateTime) now =3D g_date_time_new_now_local(); + g_autofree char *nowstr =3D g_date_time_format(now, "%Y-%m-%d = %H:%M:%S.%f%z"); + localfmt =3D g_strdup_printf("[%s] [ID: %08ld] %s", + nowstr, syscall(__NR_gettid), fmt); } fmt =3D localfmt; } --=20 2.31.1