[DTrace-devel] [PATCH v2 14/23] dtprobed: don't emit "dtprobed DEBUG" when not testing

[Nick Alcock]

It's very confusing when not testing, since even non-debugging messages get
prefixed.

Signed-off-by: Nick Alcock <nick.alcock at oracle.com>
---
 dtprobed/dtprobed.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dtprobed/dtprobed.c b/dtprobed/dtprobed.c
index 9bf8a18f59e2..104313a7bfd5 100644
--- a/dtprobed/dtprobed.c
+++ b/dtprobed/dtprobed.c
@@ -69,6 +69,7 @@ static struct fuse_session *cuse_session;
 
 int _dtrace_debug = 0;
 static int foreground;
+static int testing;
 void dt_debug_dump(int unused) {} 		/* For libproc.  */
 
 static pid_t parser_pid;
@@ -97,11 +98,13 @@ log_msg(enum fuse_log_level level, const char *fmt, va_list ap)
 		return;
 
         if (foreground) {
-		fprintf(stderr, "dtprobed DEBUG %li: ", time(NULL));
+		if (testing)
+			fprintf(stderr, "dtprobed DEBUG %li: ", time(NULL));
 		vfprintf(stderr, fmt, ap);
 	}
 	else if (sync_fd >= 0) {
-		daemon_log(sync_fd, "dtprobed DEBUG %li: ", time(NULL));
+		if (testing)
+			daemon_log(sync_fd, "dtprobed DEBUG %li: ", time(NULL));
 		daemon_vlog(sync_fd, fmt, ap);
 	} else
 		vsyslog(level, fmt, ap);
@@ -115,7 +118,8 @@ dt_debug_printf(const char *subsys, const char *fmt, va_list ap)
 		return;
 
 	if (foreground) {
-		fprintf(stderr, "%s DEBUG %li: ", subsys, time(NULL));
+		if (testing)
+			fprintf(stderr, "%s DEBUG %li: ", subsys, time(NULL));
 		vfprintf(stderr, fmt, ap);
 	} else if (sync_fd >= 0)
 		daemon_vlog(sync_fd, fmt, ap);
@@ -1019,6 +1023,7 @@ main(int argc, char *argv[])
 		tmp.sa_handler = force_reparse;
 		tmp.sa_flags = SA_RESTART;
 		(void) sigaction(SIGUSR2, &tmp, NULL);
+		testing = 1;
 	}
 
 	dof_parser_start();
-- 
2.42.0.271.g85384428f1