X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=a637a904244979b5f8b0a310e458684a03162d19;hb=af87c45a6179026e263c3a9eb251ccf8ec9537e7;hp=8cb264ab1bd74b413a4b0a32b50cf80bfdbb5343;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 8cb264ab1..a637a9042 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -40,10 +40,11 @@
 #include <config.h>
 #include <urcu/compiler.h>
 
-#include <common/lttngerr.h>
+#include <common/defaults.h>
+#include <common/common.h>
+#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
 
 #include "lttng-consumerd.h"
@@ -252,16 +253,16 @@ int main(int argc, char **argv)
 	if (strlen(command_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
-					LTTNG_RUNDIR);
+			snprintf(command_sock_path, PATH_MAX, DEFAULT_KCONSUMERD_CMD_SOCK_PATH,
+					DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
 			snprintf(command_sock_path, PATH_MAX,
-					USTCONSUMERD64_CMD_SOCK_PATH, LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
 			snprintf(command_sock_path, PATH_MAX,
-					USTCONSUMERD32_CMD_SOCK_PATH, LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");
@@ -283,16 +284,16 @@ int main(int argc, char **argv)
 	if (strlen(error_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
-			snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
-					LTTNG_RUNDIR);
+			snprintf(error_sock_path, PATH_MAX, DEFAULT_KCONSUMERD_ERR_SOCK_PATH,
+					DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER64_UST:
 			snprintf(error_sock_path, PATH_MAX,
-					USTCONSUMERD64_ERR_SOCK_PATH, LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		case LTTNG_CONSUMER32_UST:
 			snprintf(error_sock_path, PATH_MAX,
-					USTCONSUMERD32_ERR_SOCK_PATH, LTTNG_RUNDIR);
+					DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, DEFAULT_LTTNG_RUNDIR);
 			break;
 		default:
 			WARN("Unknown consumerd type");