|
 |
22c213 |
From 52e93f2dc499ead339bf808dac3480b369dfadd1 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
22c213 |
Date: Mon, 27 Jan 2020 19:01:39 +0100
|
|
|
22c213 |
Subject: [PATCH 068/116] virtiofsd: Add timestamp to the log with
|
|
|
22c213 |
FUSE_LOG_DEBUG level
|
|
|
22c213 |
MIME-Version: 1.0
|
|
|
22c213 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c213 |
Content-Transfer-Encoding: 8bit
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
Message-id: <20200127190227.40942-65-dgilbert@redhat.com>
|
|
|
22c213 |
Patchwork-id: 93517
|
|
|
22c213 |
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 064/112] virtiofsd: Add timestamp to the log with FUSE_LOG_DEBUG level
|
|
|
22c213 |
Bugzilla: 1694164
|
|
|
22c213 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
|
22c213 |
|
|
|
22c213 |
virtiofsd has some threads, so we see a lot of logs with debug option.
|
|
|
22c213 |
It would be useful for debugging if we can see the timestamp.
|
|
|
22c213 |
|
|
|
22c213 |
Add nano second timestamp, which got by get_clock(), to the log with
|
|
|
22c213 |
FUSE_LOG_DEBUG level if the syslog option isn't set.
|
|
|
22c213 |
|
|
|
22c213 |
The log is like as:
|
|
|
22c213 |
|
|
|
22c213 |
# ./virtiofsd -d -o vhost_user_socket=/tmp/vhostqemu0 -o source=/tmp/share0 -o cache=auto
|
|
|
22c213 |
...
|
|
|
22c213 |
[5365943125463727] [ID: 00000002] fv_queue_thread: Start for queue 0 kick_fd 9
|
|
|
22c213 |
[5365943125568644] [ID: 00000002] fv_queue_thread: Waiting for Queue 0 event
|
|
|
22c213 |
[5365943125573561] [ID: 00000002] fv_queue_thread: Got queue event on Queue 0
|
|
|
22c213 |
|
|
|
22c213 |
Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
|
|
|
22c213 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
22c213 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
(cherry picked from commit 50fb955aa0e6ede929422146936cf68bf1ca876f)
|
|
|
22c213 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
tools/virtiofsd/passthrough_ll.c | 9 ++++++++-
|
|
|
22c213 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
|
22c213 |
index f08324f..98114a3 100644
|
|
|
22c213 |
--- a/tools/virtiofsd/passthrough_ll.c
|
|
|
22c213 |
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
|
22c213 |
@@ -36,6 +36,7 @@
|
|
|
22c213 |
*/
|
|
|
22c213 |
|
|
|
22c213 |
#include "qemu/osdep.h"
|
|
|
22c213 |
+#include "qemu/timer.h"
|
|
|
22c213 |
#include "fuse_virtio.h"
|
|
|
22c213 |
#include "fuse_log.h"
|
|
|
22c213 |
#include "fuse_lowlevel.h"
|
|
|
22c213 |
@@ -2276,7 +2277,13 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
if (current_log_level == FUSE_LOG_DEBUG) {
|
|
|
22c213 |
- localfmt = g_strdup_printf("[ID: %08ld] %s", syscall(__NR_gettid), fmt);
|
|
|
22c213 |
+ if (!use_syslog) {
|
|
|
22c213 |
+ localfmt = g_strdup_printf("[%" PRId64 "] [ID: %08ld] %s",
|
|
|
22c213 |
+ get_clock(), syscall(__NR_gettid), fmt);
|
|
|
22c213 |
+ } else {
|
|
|
22c213 |
+ localfmt = g_strdup_printf("[ID: %08ld] %s", syscall(__NR_gettid),
|
|
|
22c213 |
+ fmt);
|
|
|
22c213 |
+ }
|
|
|
22c213 |
fmt = localfmt;
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|