X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-sessiond-comm.h;h=74d7dc99cef1385c518e13286f6085313292da3a;hp=8843a11331b3629f87ac19bb36ba9be79ae5f930;hb=90d97d10e57ba8b2b10481837efb3d2402f41f88;hpb=9df8df5ea4a12be72f265c3c0d6911ac4e207bc0

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index 8843a1133..74d7dc99c 100644
--- a/include/lttng-sessiond-comm.h
+++ b/include/lttng-sessiond-comm.h
@@ -30,12 +30,13 @@
 #include <lttng/lttng.h>
 
 #define LTTNG_RUNDIR                        "/var/run/lttng"
+#define LTTNG_HOME_RUNDIR                   "%s/.lttng"
 
 /* Default unix socket path */
 #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"
+#define DEFAULT_HOME_APPS_UNIX_SOCK         LTTNG_HOME_RUNDIR "/apps-lttng-sessiond"
+#define DEFAULT_HOME_CLIENT_UNIX_SOCK       LTTNG_HOME_RUNDIR "/client-lttng-sessiond"
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
@@ -125,12 +126,16 @@ 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 */
 	LTTCOMM_UST_NO_SESSION,		/* No UST session found */
 	LTTCOMM_UST_LIST_FAIL,			/* UST listing events failed */
+	LTTCOMM_UST_EVENT_EXIST,        /* UST event exist */
+	LTTCOMM_UST_EVENT_NOT_FOUND,    /* UST event not found */
+	LTTCOMM_UST_CONTEXT_EXIST,      /* UST context exist */
 
 	CONSUMERD_COMMAND_SOCK_READY,		/* when consumerd command socket ready */
 	CONSUMERD_SUCCESS_RECV_FD,		/* success on receiving fds */
@@ -227,7 +232,7 @@ struct lttcomm_consumer_msg {
 	} u;
 };
 
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
+#ifdef HAVE_LIBLTTNG_UST_CTL
 
 #include <lttng/ust-abi.h>
 
@@ -266,7 +271,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);