[DTrace-devel] [PATCH 1/4] dtprobed: don't emit "dtprobed DEBUG" when not testing

[Kris Van Hees]

Maybe put this into the "dtprobed: logging improvements" patch, since they are
in the same series?

On Thu, Aug 10, 2023 at 09:31:33PM +0100, Nick Alcock via DTrace-devel wrote:
> 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 9bf8a18f59e27..104313a7bfd5e 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();
> 
> base-commit: 42f15d3235bcf816ed814b88d64492a63fc5f0f0
> prerequisite-patch-id: 52ce11c079ec2f65353146f18303b24fa9ff62e2
> prerequisite-patch-id: 9bc8cfafabd7ab0579f0a27e30a87b3587bb5f9f
> prerequisite-patch-id: 36029942b8e0fb4863721accb514d53199c3cc15
> prerequisite-patch-id: 311784758ab15c7f1bb41ad1c054b9b28aa7f8a3
> prerequisite-patch-id: 6dae9b2a704bdf47b0c5fe33419c6192a90022e6
> prerequisite-patch-id: 1955f24b076143dd23ce6891c8d9b967100eeb3a
> prerequisite-patch-id: 93b2d575d476e1161dd8e78a785a8b7d47c51c63
> prerequisite-patch-id: 9fa5e3f8bbb20bae6e94ed1aec4006b561d5200e
> prerequisite-patch-id: 79a97c0ecde13efa67ccd9a0bd468bee62ad6545
> prerequisite-patch-id: 4761cfcb57543dcfee1e527a4050ac073f895694
> prerequisite-patch-id: a1b67b863ae8524ea6a2eeb17dfad937b3f36efd
> prerequisite-patch-id: 3b8d1d4ac33178ee30df262a8e97ea8ddcfe8d08
> prerequisite-patch-id: bb04bcb898ee1a3a2cba63230c87e7719fae7f85
> prerequisite-patch-id: 241757982119cc76f1b11d13d496f931ed794d6f
> prerequisite-patch-id: b70b16fd155514aab31448a67679bf8f6cfa80ba
> prerequisite-patch-id: ae96e31c0192a1a7262589a3d02ed582a3589db2
> -- 
> 2.41.0.270.g68fa1d84b5
> 
> 
> _______________________________________________
> DTrace-devel mailing list
> DTrace-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/dtrace-devel