X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=6c6c6c454a53abba8dd480c40160848c8b84d4ac;hb=8c93562f396a3e785c5193ca32b40f1f16599a6a;hp=9f8d182b3cf610551df792b8cda82646c453110a;hpb=10646003ec8dd54b76990cf335ef2bc56ab17a3e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 9f8d182b3..6c6c6c454 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -50,7 +50,7 @@ struct ltt_ust_event {
 	struct lttng_ust_event attr;
 	struct lttng_ht_node_str node;
 	struct lttng_ust_filter_bytecode *filter;
-	const struct lttng_event_exclusion *exclusion;
+	struct lttng_event_exclusion *exclusion;
 };
 
 /* UST channel */
@@ -67,15 +67,6 @@ struct ltt_ust_channel {
 	uint64_t tracefile_count;
 };
 
-/* UST Metadata */
-struct ltt_ust_metadata {
-	int handle;
-	struct lttng_ust_object_data *obj;
-	char pathname[PATH_MAX];              /* Trace file path name */
-	struct lttng_ust_channel_attr attr;
-	struct lttng_ust_object_data *stream_obj;
-};
-
 /* UST domain global (LTTNG_DOMAIN_UST) */
 struct ltt_ust_domain_global {
 	struct lttng_ht *channels;
@@ -116,6 +107,9 @@ struct ltt_ust_session {
 	unsigned int snapshot_mode;
 	unsigned int has_non_default_channel;
 	unsigned int live_timer_interval;	/* usec */
+
+	/* Metadata channel attributes. */
+	struct lttng_ust_channel_attr metadata_attr;
 };
 
 /*
@@ -170,7 +164,6 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion);
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path);
 struct ltt_ust_context *trace_ust_create_context(
 		struct lttng_event_context *ctx);
 void trace_ust_delete_channel(struct lttng_ht *ht,
@@ -181,7 +174,6 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
  * it's applies.
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session);
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
 void trace_ust_destroy_event(struct ltt_ust_event *event);
 
@@ -221,22 +213,11 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 {
 	return NULL;
 }
-static inline
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
-{
-	return NULL;
-}
-
 static inline
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
 }
 
-static inline
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
-{
-}
-
 static inline
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {