X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=aa66059adafb5aaa2d0270f0f0634ca3414b34b6;hp=59ef85b78cf9c082eb00b407066a1e78a272acb7;hb=51755dc8c7607233c5f62b7931326d7d95df7910;hpb=d7ba13889c8692b14f99238ddf2721ed78df89d2

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 59ef85b78..aa66059ad 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,6 @@
 
 #include <common/compat/uuid.h>
 
-#include "agent.h"
 #include "trace-ust.h"
 #include "ust-registry.h"
 
@@ -48,9 +47,9 @@ struct ust_app_notify_sock_obj {
 
 struct ust_app_ht_key {
 	const char *name;
-	const struct lttng_ust_filter_bytecode *filter;
+	const struct lttng_filter_bytecode *filter;
 	enum lttng_ust_loglevel_type loglevel;
-	const struct lttng_ust_event_exclusion *exclusion;
+	const struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -115,8 +114,8 @@ struct ust_app_event {
 	struct lttng_ust_event attr;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ht_node_str node;
-	struct lttng_ust_filter_bytecode *filter;
-	struct lttng_ust_event_exclusion *exclusion;
+	struct lttng_filter_bytecode *filter;
+	struct lttng_event_exclusion *exclusion;
 };
 
 struct ust_app_stream {
@@ -216,6 +215,7 @@ struct ust_app_session {
 	/* Metadata channel attributes. */
 	struct ustctl_consumer_channel_attr metadata_attr;
 
+	char root_shm_path[PATH_MAX];
 	char shm_path[PATH_MAX];
 };
 
@@ -312,7 +312,8 @@ int ust_app_disable_event_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
 int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
 		struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx);
-void ust_app_global_update(struct ltt_ust_session *usess, int sock);
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app);
+void ust_app_global_update_all(struct ltt_ust_session *usess);
 
 void ust_app_clean_list(void);
 int ust_app_ht_alloc(void);
@@ -419,7 +420,7 @@ int ust_app_ht_alloc(void)
 	return 0;
 }
 static inline
-void ust_app_global_update(struct ltt_ust_session *usess, int sock)
+void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app)
 {}
 static inline
 int ust_app_disable_channel_glb(struct ltt_ust_session *usess,