*
*/
-#include "version.h"
-#include "sessiond-config.h"
-#include "lttng-ust-ctl.h"
-#include <common/defaults.h>
+#include "version.hpp"
+#include "sessiond-config.hpp"
+#include "lttng-ust-ctl.hpp"
+#include <common/defaults.hpp>
#include <limits.h>
#include <ctype.h>
-#include <common/error.h>
-#include <common/utils.h>
-#include <common/compat/errno.h>
-#include <common/compat/getenv.h>
+#include <common/error.hpp>
+#include <common/utils.hpp>
+#include <common/path.hpp>
+#include <common/compat/errno.hpp>
+#include <common/compat/getenv.hpp>
static
struct sessiond_config sessiond_config_build_defaults = {
.daemonize = false,
.sig_parent = false,
- .tracing_group_name = { (char *) DEFAULT_TRACING_GROUP },
- .kmod_probes_list = { nullptr },
- .kmod_extra_probes_list = { nullptr },
-
- .rundir = { nullptr },
-
- .apps_unix_sock_path = { nullptr },
- .client_unix_sock_path = { nullptr },
- .wait_shm_path = { nullptr },
- .health_unix_sock_path = { nullptr },
- .lttng_ust_clock_plugin = { nullptr },
- .pid_file_path = { nullptr },
- .lock_file_path = { nullptr },
- .load_session_path = { nullptr },
- .agent_port_file_path = { nullptr },
-
- .consumerd32_path = { nullptr },
- .consumerd32_bin_path = { nullptr },
- .consumerd32_lib_dir = { nullptr },
- .consumerd32_err_unix_sock_path = { nullptr },
- .consumerd32_cmd_unix_sock_path = { nullptr },
-
- .consumerd64_path = { nullptr },
- .consumerd64_bin_path = { nullptr },
- .consumerd64_lib_dir = { nullptr },
- .consumerd64_err_unix_sock_path = { nullptr },
- .consumerd64_cmd_unix_sock_path = { nullptr },
-
- .kconsumerd_path = { nullptr },
- .kconsumerd_err_unix_sock_path = { nullptr },
- .kconsumerd_cmd_unix_sock_path = { nullptr },
+ .tracing_group_name = { (char *) DEFAULT_TRACING_GROUP, false },
+
+ .kmod_probes_list = { nullptr, false },
+ .kmod_extra_probes_list = { nullptr, false },
+
+ .rundir = { nullptr, false },
+
+ .apps_unix_sock_path = { nullptr, false },
+ .client_unix_sock_path = { nullptr, false },
+ .wait_shm_path = { nullptr, false },
+ .health_unix_sock_path = { nullptr, false },
+ .lttng_ust_clock_plugin = { nullptr, false },
+ .pid_file_path = { nullptr, false },
+ .lock_file_path = { nullptr, false },
+ .load_session_path = { nullptr, false },
+ .agent_port_file_path = { nullptr, false },
+
+ .consumerd32_path = { nullptr, false },
+ .consumerd32_bin_path = { nullptr, false },
+ .consumerd32_lib_dir = { nullptr, false },
+ .consumerd32_err_unix_sock_path = { nullptr, false },
+ .consumerd32_cmd_unix_sock_path = { nullptr, false },
+
+ .consumerd64_path = { nullptr, false },
+ .consumerd64_bin_path = { nullptr, false },
+ .consumerd64_lib_dir = { nullptr, false },
+ .consumerd64_err_unix_sock_path = { nullptr, false },
+ .consumerd64_cmd_unix_sock_path = { nullptr, false },
+
+ .kconsumerd_path = { nullptr, false },
+ .kconsumerd_err_unix_sock_path = { nullptr, false },
+ .kconsumerd_cmd_unix_sock_path = { nullptr, false },
};
static