On 28 May 2018 at 16:51, Jonathan Rajotte <jonathan.rajotte-julien@ efficios.com> wrote:
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-jul...@efficios.com> > --- > v2: > - Fix alignment of verbose, verbose consumer, quiet mode,agent_tcp_port > - bin_path -> bin path > - Update commit > - Use ternary operator and use "Unknown" for NULL values. > > Side question: > > Was there a reason, except code indentation, that left justification is not > used here ('-' printf flag from C99 standard)? > Ah, no reason other than my ignorance of those printf() specifiers :-) I'll probably change the code to make use of it. The patch looks good and is merged in master. Thanks! Jérémie > > --- > src/bin/lttng-sessiond/sessiond-config.c | 59 +++++++++++++++--------- > 1 file changed, 36 insertions(+), 23 deletions(-) > > diff --git a/src/bin/lttng-sessiond/sessiond-config.c > b/src/bin/lttng-sessiond/sessiond-config.c > index 587f2f82..0b540865 100644 > --- a/src/bin/lttng-sessiond/sessiond-config.c > +++ b/src/bin/lttng-sessiond/sessiond-config.c > @@ -491,32 +491,45 @@ LTTNG_HIDDEN > void sessiond_config_log(struct sessiond_config *config) > { > DBG_NO_LOC("[sessiond configuration]"); > - DBG_NO_LOC("\tverbose: %i", config->verbose); > - DBG_NO_LOC("\tverbose consumer: %i", > config->verbose_consumer); > - DBG_NO_LOC("\tquiet mode: %s", config->quiet ? > "True" : "False"); > + DBG_NO_LOC("\tverbose: %i", config->verbose); > + DBG_NO_LOC("\tverbose consumer: %i", > config->verbose_consumer); > + DBG_NO_LOC("\tquiet mode: %s", config->quiet ? > "True" : "False"); > if (config->agent_tcp_port.begin == config->agent_tcp_port.end) { > - DBG_NO_LOC("\tagent_tcp_port: %i", > config->agent_tcp_port.begin); > + DBG_NO_LOC("\tagent_tcp_port: %i", > config->agent_tcp_port.begin); > } else { > - DBG_NO_LOC("\tagent_tcp_port: [%i, %i]", > + DBG_NO_LOC("\tagent_tcp_port: [%i, %i]", > config->agent_tcp_port.begin, > config->agent_tcp_port.end); > } > - DBG_NO_LOC("\tapplication socket timeout: %i", > config->app_socket_timeout); > - DBG_NO_LOC("\tno-kernel: %s", config->no_kernel > ? "True" : "False"); > - DBG_NO_LOC("\tbackground: %s", > config->background ? "True" : "False"); > - DBG_NO_LOC("\tdaemonize: %s", config->daemonize > ? "True" : "False"); > - DBG_NO_LOC("\tsignal parent on start: %s", > config->sig_parent ? "True" : "False"); > - DBG_NO_LOC("\ttracing group name: %s", > config->tracing_group_name.value ? : "Unknown"); > - DBG_NO_LOC("\tkmod_probe_list: %s", > config->kmod_probes_list.value ? : "None"); > - DBG_NO_LOC("\tkmod_extra_probe_list: %s", > config->kmod_extra_probes_list.value ? : "None"); > - DBG_NO_LOC("\trundir: %s", > config->rundir.value ? : "Unknown"); > - DBG_NO_LOC("\tapplication socket path: %s", config-> > apps_unix_sock_path.value ? : "Unknown"); > - DBG_NO_LOC("\tclient socket path: %s", > config->client_unix_sock_path.value ? : "Unknown"); > - DBG_NO_LOC("\twait shm path: %s", > config->wait_shm_path.value ? : "Unknown"); > - DBG_NO_LOC("\thealth socket path: %s", > config->health_unix_sock_path.value ? : "Unknown"); > - DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN: %s", > config->lttng_ust_clock_plugin.value ? : "None"); > - DBG_NO_LOC("\tpid file path: %s", > config->pid_file_path.value ? : "Unknown"); > - DBG_NO_LOC("\tlock file path: %s", > config->lock_file_path.value ? : "Unknown"); > - DBG_NO_LOC("\tsession load path: %s", > config->load_session_path.value ? : "None"); > - DBG_NO_LOC("\tagent port file path: %s", > config->agent_port_file_path.value ? : "Unknown"); > + DBG_NO_LOC("\tapplication socket timeout: %i", > config->app_socket_timeout); > + DBG_NO_LOC("\tno-kernel: %s", > config->no_kernel ? "True" : "False"); > + DBG_NO_LOC("\tbackground: %s", > config->background ? "True" : "False"); > + DBG_NO_LOC("\tdaemonize: %s", > config->daemonize ? "True" : "False"); > + DBG_NO_LOC("\tsignal parent on start: %s", > config->sig_parent ? "True" : "False"); > + DBG_NO_LOC("\ttracing group name: %s", > config->tracing_group_name.value ? : "Unknown"); > + DBG_NO_LOC("\tkmod_probe_list: %s", > config->kmod_probes_list.value ? : "None"); > + DBG_NO_LOC("\tkmod_extra_probe_list: %s", > config->kmod_extra_probes_list.value ? : "None"); > + DBG_NO_LOC("\trundir: %s", > config->rundir.value ? : "Unknown"); > + DBG_NO_LOC("\tapplication socket path: %s", config-> > apps_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tclient socket path: %s", > config->client_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\twait shm path: %s", > config->wait_shm_path.value ? : "Unknown"); > + DBG_NO_LOC("\thealth socket path: %s", > config->health_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tLTTNG_UST_CLOCK_PLUGIN: %s", > config->lttng_ust_clock_plugin.value ? : "None"); > + DBG_NO_LOC("\tpid file path: %s", > config->pid_file_path.value ? : "Unknown"); > + DBG_NO_LOC("\tlock file path: %s", > config->lock_file_path.value ? : "Unknown"); > + DBG_NO_LOC("\tsession load path: %s", > config->load_session_path.value ? : "None"); > + DBG_NO_LOC("\tagent port file path: %s", > config->agent_port_file_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd32 path: %s", > config->consumerd32_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd32 bin path: %s", > config->consumerd32_bin_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd32 lib dir: %s", config-> > consumerd32_lib_dir.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd32 err unix sock path:%s", > config->consumerd32_err_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd32 cmd unix sock path:%s", > config->consumerd32_cmd_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd64 path: %s", > config->consumerd64_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd64 bin path: %s", > config->consumerd64_bin_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd64 lib dir: %s", config-> > consumerd64_lib_dir.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd64 err unix sock path:%s", > config->consumerd64_err_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tconsumerd64 cmd unix sock path:%s", > config->consumerd64_cmd_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tkconsumerd path: %s", > config->kconsumerd_path.value ? : "Unknown"); > + DBG_NO_LOC("\tkconsumerd err unix sock path: %s", > config->kconsumerd_err_unix_sock_path.value ? : "Unknown"); > + DBG_NO_LOC("\tkconsumerd cmd unix sock path: %s", > config->kconsumerd_cmd_unix_sock_path.value ? : "Unknown"); > } > -- > 2.17.0 > > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com
_______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev