diff mbox series

[060/104] virtiofsd: Add timestamp to the log with FUSE_LOG_DEBUG level

Message ID 20191212163904.159893-61-dgilbert@redhat.com
State New
Headers show
Series virtiofs daemon [all] | expand

Commit Message

Dr. David Alan Gilbert Dec. 12, 2019, 4:38 p.m. UTC 
From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>

virtiofsd has some threads, so we see a lot of logs with debug option.
It would be useful for debugging if we can see the timestamp.

Add nano second timestamp, which got by get_clock(), to the log with
FUSE_LOG_DEBUG level if the syslog option isn't set.

The log is like as:

  ]# ./virtiofsd -d -o vhost_user_socket=/tmp/vhostqemu0 -o source=/tmp/share0 -o cache=auto
  ...
  [5365943125463727] [ID: 00000002] fv_queue_thread: Start for queue 0 kick_fd 9
  [5365943125568644] [ID: 00000002] fv_queue_thread: Waiting for Queue 0 event
  [5365943125573561] [ID: 00000002] fv_queue_thread: Got queue event on Queue 0

Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
---
 tools/virtiofsd/passthrough_ll.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Daniel P. Berrangé Jan. 7, 2020, 11:11 a.m. UTC | #1 
On Thu, Dec 12, 2019 at 04:38:20PM +0000, Dr. David Alan Gilbert (git) wrote:
> From: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
> 
> virtiofsd has some threads, so we see a lot of logs with debug option.
> It would be useful for debugging if we can see the timestamp.
> 
> Add nano second timestamp, which got by get_clock(), to the log with
> FUSE_LOG_DEBUG level if the syslog option isn't set.
> 
> The log is like as:
> 
>   ]# ./virtiofsd -d -o vhost_user_socket=/tmp/vhostqemu0 -o source=/tmp/share0 -o cache=auto
>   ...
>   [5365943125463727] [ID: 00000002] fv_queue_thread: Start for queue 0 kick_fd 9
>   [5365943125568644] [ID: 00000002] fv_queue_thread: Waiting for Queue 0 event
>   [5365943125573561] [ID: 00000002] fv_queue_thread: Got queue event on Queue 0
> 
> Signed-off-by: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
> ---
>  tools/virtiofsd/passthrough_ll.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
diff mbox series

Patch

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 8e00a90e6f..91d3120033 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -35,6 +35,8 @@ 
  * \include passthrough_ll.c
  */
 
+#include "qemu/osdep.h"
+#include "qemu/timer.h"
 #include "fuse_virtio.h"
 #include "fuse_log.h"
 #include "fuse_lowlevel.h"
@@ -2258,7 +2260,12 @@  static void log_func(enum fuse_log_level level, const char *_fmt, va_list ap)
     }
 
     if (current_log_level == FUSE_LOG_DEBUG) {
-        fmt = g_strdup_printf("[ID: %08ld] %s", syscall(__NR_gettid), _fmt);
+        if (!use_syslog) {
+            fmt = g_strdup_printf("[%ld] [ID: %08ld] %s", get_clock(),
+                                  syscall(__NR_gettid), _fmt);
+        } else {
+            fmt = g_strdup_printf("[ID: %08ld] %s", syscall(__NR_gettid), _fmt);
+        }
     }
 
     if (use_syslog) {