X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng-sessiond-comm.h;h=d282f77dea2cb485f964b56740a1822998339aa9;hb=7753dea8e1af2342c4d42d2efc5da62538709ca8;hp=f30bf6673d599610b818adcd6c2c4291f7a8dd6b;hpb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;p=lttng-tools.git

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index f30bf6673..d282f77de 100644
--- a/include/lttng-sessiond-comm.h
+++ b/include/lttng-sessiond-comm.h
@@ -32,10 +32,10 @@
 #define LTTNG_RUNDIR                        "/var/run/lttng"
 
 /* Default unix socket path */
-#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-ltt-sessiond"
-#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-ltt-sessiond"
-#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-ltt-sessiond"
-#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
+#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-lttng-sessiond"
+#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-lttng-sessiond"
+#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-lttng-sessiond"
+#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-lttng-sessiond"
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -125,7 +125,8 @@ enum lttcomm_return_code {
 	LTTCOMM_UST_META_FAIL,			/* UST open metadata failed */
 	LTTCOMM_UST_START_FAIL,		/* UST start trace failed */
 	LTTCOMM_UST_STOP_FAIL,			/* UST stop trace failed */
-	LTTCOMM_UST_CONSUMER_FAIL,		/* UST consumer start failed */
+	LTTCOMM_UST_CONSUMER64_FAIL,		/* 64-bit UST consumer start failed */
+	LTTCOMM_UST_CONSUMER32_FAIL,		/* 32-bit UST consumer start failed */
 	LTTCOMM_UST_STREAM_FAIL,		/* UST create stream failed */
 	LTTCOMM_UST_DIR_FAIL,			/* UST trace directory creation failed */
 	LTTCOMM_UST_DIR_EXIST,			/* UST trace directory exist */
@@ -227,9 +228,9 @@ struct lttcomm_consumer_msg {
 	} u;
 };
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 
-#include <ust/lttng-ust-abi.h>
+#include <lttng/ust-abi.h>
 
 /*
  * Data structure for the commands sent from sessiond to UST.
@@ -266,7 +267,7 @@ struct lttcomm_ust_reply {
 	} u;
 };
 
-#endif /* CONFIG_LTTNG_TOOLS_HAVE_UST */
+#endif /* HAVE_LIBLTTNG_UST_CTL */
 
 extern int lttcomm_create_unix_sock(const char *pathname);
 extern int lttcomm_connect_unix_sock(const char *pathname);