X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=7d0b6296524c0f7d6a11566aa5de9f49312a8180;hb=95c5cc3c3256d17894154e967e3d3e55b4a223e2;hp=64d91c98653ab3ae1f35f18662f289f872327ac6;hpb=df854e41ded4203a5b86bac062b8604bb038759a;p=lttng-ust.git

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 64d91c98..7d0b6296 100644
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -39,12 +39,13 @@
 #define LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS	3000
 
 #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"
 
 #define DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH   "/lttng-ust-apps-wait"
 #define DEFAULT_HOME_APPS_WAIT_SHM_PATH     "/lttng-ust-apps-wait-%u"
@@ -129,8 +130,7 @@ struct ustcomm_ust_msg {
 		struct lttng_ust_event event;
 		struct lttng_ust_context context;
 		struct lttng_ust_tracer_version version;
-		char tracepoint_list_entry[LTTNG_UST_SYM_NAME_LEN];
-		struct lttng_ust_loglevel loglevel_list_entry;
+		struct lttng_ust_tracepoint_iter tracepoint;
 	} u;
 };
 
@@ -151,8 +151,7 @@ struct ustcomm_ust_reply {
 			uint64_t memory_map_size;
 		} stream;
 		struct lttng_ust_tracer_version version;
-		char tracepoint_list_entry[LTTNG_UST_SYM_NAME_LEN];
-		struct lttng_ust_loglevel loglevel_list_entry;
+		struct lttng_ust_tracepoint_iter tracepoint;
 	} u;
 };