<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 28 May 2018 at 16:51, Jonathan Rajotte <span dir="ltr"><<a href="mailto:jonathan.rajotte-julien@efficios.com" target="_blank">jonathan.rajotte-julien@<wbr>efficios.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Jonathan Rajotte <<a href="mailto:jonathan.rajotte-julien@efficios.com" target="_blank">jonathan.rajotte-julien@effic<wbr>ios.com</a>><br>
---<br>
v2:<br>
- Fix alignment of verbose, verbose consumer, quiet mode,agent_tcp_port<br>
- bin_path -> bin path<br>
- Update commit<br>
- Use ternary operator and use "Unknown" for NULL values.<br>
<br>
Side question:<br>
<br>
Was there a reason, except code indentation, that left justification is not<br>
used here ('-' printf flag from C99 standard)?<br></blockquote><div><br></div><div>Ah, no reason other than my ignorance of those printf() specifiers :-)</div><div>I'll probably change the code to make use of it.<br></div><div><br></div><div>The patch looks good and is merged in master. Thanks!<br></div><div>Jérémie<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
---<br>
src/bin/lttng-sessiond/sessio<wbr>nd-config.c | 59 +++++++++++++++---------<br>
1 file changed, 36 insertions(+), 23 deletions(-)<br>
<br>
diff --git a/src/bin/lttng-sessiond/sessi<wbr>ond-config.c b/src/bin/lttng-sessiond/sessi<wbr>ond-config.c<br>
index 587f2f82..0b540865 100644<br>
--- a/src/bin/lttng-sessiond/sessi<wbr>ond-config.c<br>
+++ b/src/bin/lttng-sessiond/sessi<wbr>ond-config.c<br>
@@ -491,32 +491,45 @@ LTTNG_HIDDEN<br>
void sessiond_config_log(struct sessiond_config *config)<br>
{<br>
DBG_NO_LOC("[sessiond configuration]");<br>
- DBG_NO_LOC("\tverbose: %i", config->verbose);<br>
- DBG_NO_LOC("\tverbose consumer: %i", config->verbose_consumer);<br>
- DBG_NO_LOC("\tquiet mode: %s", config->quiet ? "True" : "False");<br>
+ DBG_NO_LOC("\tverbose: %i", config->verbose);<br>
+ DBG_NO_LOC("\tverbose consumer: %i", config->verbose_consumer);<br>
+ DBG_NO_LOC("\tquiet mode: %s", config->quiet ? "True" : "False");<br>
if (config->agent_tcp_port.begin == config->agent_tcp_port.end) {<br>
- DBG_NO_LOC("\tagent_tcp_port:<wbr> %i", config->agent_tcp_port.begin);<br>
+ DBG_NO_LOC("\tagent_tcp_port:<wbr> %i", config->agent_tcp_port.begin);<br>
} else {<br>
- DBG_NO_LOC("\tagent_tcp_port:<wbr> [%i, %i]",<br>
+ DBG_NO_LOC("\tagent_tcp_port:<wbr> [%i, %i]",<br>
config->agent_tcp_port.begin,<br>
config->agent_tcp_port.end);<br>
}<br>
- DBG_NO_LOC("\tapplication socket timeout: %i", config->app_socket_timeout);<br>
- DBG_NO_LOC("\tno-kernel: %s", config->no_kernel ? "True" : "False");<br>
- DBG_NO_LOC("\tbackground: %s", config->background ? "True" : "False");<br>
- DBG_NO_LOC("\tdaemonize: %s", config->daemonize ? "True" : "False");<br>
- DBG_NO_LOC("\tsignal parent on start: %s", config->sig_parent ? "True" : "False");<br>
- DBG_NO_LOC("\ttracing group name: %s", config->tracing_group_name.val<wbr>ue ? : "Unknown");<br>
- DBG_NO_LOC("\tkmod_probe_<wbr>list: %s", config->kmod_probes_list.value ? : "None");<br>
- DBG_NO_LOC("\tkmod_extra_prob<wbr>e_list: %s", config->kmod_extra_probes_list<wbr>.value ? : "None");<br>
- DBG_NO_LOC("\trundir: %s", config->rundir.value ? : "Unknown");<br>
- DBG_NO_LOC("\tapplication socket path: %s", config-><a href="http://apps_unix_sock_path.va">apps_unix_sock_path.va</a><wbr>lue ? : "Unknown");<br>
- DBG_NO_LOC("\tclient socket path: %s", config->client_unix_sock_path.<wbr>value ? : "Unknown");<br>
- DBG_NO_LOC("\twait shm path: %s", config->wait_shm_path.value ? : "Unknown");<br>
- DBG_NO_LOC("\thealth socket path: %s", config->health_unix_sock_path.<wbr>value ? : "Unknown");<br>
- DBG_NO_LOC("\tLTTNG_UST_<wbr>CLOCK_PLUGIN: %s", config->lttng_ust_clock_plugin<wbr>.value ? : "None");<br>
- DBG_NO_LOC("\tpid file path: %s", config->pid_file_path.value ? : "Unknown");<br>
- DBG_NO_LOC("\tlock file path: %s", config->lock_file_path.value ? : "Unknown");<br>
- DBG_NO_LOC("\tsession load path: %s", config->load_session_path.valu<wbr>e ? : "None");<br>
- DBG_NO_LOC("\tagent port file path: %s", config->agent_port_file_path.v<wbr>alue ? : "Unknown");<br>
+ DBG_NO_LOC("\tapplication socket timeout: %i", config->app_socket_timeout);<br>
+ DBG_NO_LOC("\tno-kernel: %s", config->no_kernel ? "True" : "False");<br>
+ DBG_NO_LOC("\tbackground: %s", config->background ? "True" : "False");<br>
+ DBG_NO_LOC("\tdaemonize: %s", config->daemonize ? "True" : "False");<br>
+ DBG_NO_LOC("\tsignal parent on start: %s", config->sig_parent ? "True" : "False");<br>
+ DBG_NO_LOC("\ttracing group name: %s", config->tracing_group_name.val<wbr>ue ? : "Unknown");<br>
+ DBG_NO_LOC("\tkmod_probe_<wbr>list: %s", config->kmod_probes_list.value ? : "None");<br>
+ DBG_NO_LOC("\tkmod_extra_prob<wbr>e_list: %s", config->kmod_extra_probes_list<wbr>.value ? : "None");<br>
+ DBG_NO_LOC("\trundir: %s", config->rundir.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tapplication socket path: %s", config-><a href="http://apps_unix_sock_path.va">apps_unix_sock_path.va</a><wbr>lue ? : "Unknown");<br>
+ DBG_NO_LOC("\tclient socket path: %s", config->client_unix_sock_path.<wbr>value ? : "Unknown");<br>
+ DBG_NO_LOC("\twait shm path: %s", config->wait_shm_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\thealth socket path: %s", config->health_unix_sock_path.<wbr>value ? : "Unknown");<br>
+ DBG_NO_LOC("\tLTTNG_UST_<wbr>CLOCK_PLUGIN: %s", config->lttng_ust_clock_plugin<wbr>.value ? : "None");<br>
+ DBG_NO_LOC("\tpid file path: %s", config->pid_file_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tlock file path: %s", config->lock_file_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tsession load path: %s", config->load_session_path.valu<wbr>e ? : "None");<br>
+ DBG_NO_LOC("\tagent port file path: %s", config->agent_port_file_path.v<wbr>alue ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd32 path: %s", config->consumerd32_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd32 bin path: %s", config->consumerd32_bin_path.v<wbr>alue ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd32 lib dir: %s", config-><a href="http://consumerd32_lib_dir.va">consumerd32_lib_dir.va</a><wbr>lue ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd32 err unix sock path:%s", config->consumerd32_err_unix_s<wbr>ock_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd32 cmd unix sock path:%s", config->consumerd32_cmd_unix_s<wbr>ock_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd64 path: %s", config->consumerd64_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd64 bin path: %s", config->consumerd64_bin_path.v<wbr>alue ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd64 lib dir: %s", config-><a href="http://consumerd64_lib_dir.va">consumerd64_lib_dir.va</a><wbr>lue ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd64 err unix sock path:%s", config->consumerd64_err_unix_s<wbr>ock_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tconsumerd64 cmd unix sock path:%s", config->consumerd64_cmd_unix_s<wbr>ock_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tkconsumerd path: %s", config->kconsumerd_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tkconsumerd err unix sock path: %s", config->kconsumerd_err_unix_so<wbr>ck_path.value ? : "Unknown");<br>
+ DBG_NO_LOC("\tkconsumerd cmd unix sock path: %s", config->kconsumerd_cmd_unix_so<wbr>ck_path.value ? : "Unknown");<br>
}<br>
<span class="m_-7940114411399799979HOEnZb"><font color="#888888">-- <br>
2.17.0<br>
<br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="m_-7940114411399799979gmail_signature" data-smartmail="gmail_signature">Jérémie Galarneau<br>EfficiOS Inc.<br><a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a></div>
</div></div>