66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
From ebf6be5ba316ffda354af5eb1f1241ad6543b3cd Mon Sep 17 00:00:00 2001
|
|
From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
|
|
Date: Thu, 18 Aug 2022 14:46:19 -0400
|
|
Subject: [PATCH 3/3] virtiofsd: use g_date_time_get_microsecond to get
|
|
subsecond
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-MergeRequest: 222: virtiofsd: use g_date_time_get_microsecond to get subsecond
|
|
RH-Bugzilla: 2018885
|
|
RH-Acked-by: Vivek Goyal <None>
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-Acked-by: Sergio Lopez <slp@redhat.com>
|
|
RH-Commit: [1/1] da8795576acc7029044a801ef42676d66471a577
|
|
|
|
The "%f" specifier in g_date_time_format() is only available in glib
|
|
2.65.2 or later. If combined with older glib, the function returns null
|
|
and the timestamp displayed as "(null)".
|
|
|
|
For backward compatibility, g_date_time_get_microsecond should be used
|
|
to retrieve subsecond.
|
|
|
|
In this patch the g_date_time_format() leaves subsecond field as "%06d"
|
|
and let next snprintf to format with g_date_time_get_microsecond.
|
|
|
|
Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit f16d15c9276bd8f501f861c39cbd4adc812d0c1d)
|
|
---
|
|
tools/virtiofsd/passthrough_ll.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
index b3d0674f6d..523d8fbe1e 100644
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
@@ -3791,6 +3791,7 @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
|
|
static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
|
|
{
|
|
g_autofree char *localfmt = NULL;
|
|
+ char buf[64];
|
|
|
|
if (current_log_level < level) {
|
|
return;
|
|
@@ -3803,9 +3804,11 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
|
|
fmt);
|
|
} else {
|
|
g_autoptr(GDateTime) now = g_date_time_new_now_utc();
|
|
- g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
|
|
+ g_autofree char *nowstr = g_date_time_format(now,
|
|
+ "%Y-%m-%d %H:%M:%S.%%06d%z");
|
|
+ snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
|
|
localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
|
|
- nowstr, syscall(__NR_gettid), fmt);
|
|
+ buf, syscall(__NR_gettid), fmt);
|
|
}
|
|
fmt = localfmt;
|
|
}
|
|
--
|
|
2.35.3
|
|
|