X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=f5fa092629d60e7030ac0b92aba0d943228268ab;hb=45893984238b2e2c12fc0d84b90336c98a6d98c9;hp=4004f9af2c5d3573a4de417b9cd7b6bbf5191c57;hpb=37a86c61f06aa7eeba59374e4404f1b64c7c709c;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 4004f9af2..f5fa09262 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -35,12 +35,6 @@ struct ltt_ust_ht_key {
 	enum lttng_ust_loglevel_type loglevel;
 };
 
-/* UST Stream list */
-struct ltt_ust_stream_list {
-	unsigned int count;
-	struct cds_list_head head;
-};
-
 /* Context hash table nodes */
 struct ltt_ust_context {
 	struct lttng_ust_context ctx;
@@ -55,23 +49,12 @@ struct ltt_ust_event {
 	struct lttng_ust_filter_bytecode *filter;
 };
 
-/* UST stream */
-struct ltt_ust_stream {
-	int handle;
-	char pathname[PATH_MAX];
-	/* Format is %s_%d respectively channel name and CPU number. */
-	char name[DEFAULT_STREAM_NAME_LEN];
-	struct lttng_ust_object_data *obj;
-	/* Using a list of streams to keep order. */
-	struct cds_list_head list;
-};
-
 /* UST channel */
 struct ltt_ust_channel {
 	unsigned int enabled;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	char pathname[PATH_MAX];
-	struct lttng_ust_channel attr;
+	struct lttng_ust_channel_attr attr;
 	struct lttng_ht *ctx;
 	struct lttng_ht *events;
 	struct lttng_ht_node_str node;
@@ -82,7 +65,7 @@ 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;
+	struct lttng_ust_channel_attr attr;
 	struct lttng_ust_object_data *stream_obj;
 };
 
@@ -151,7 +134,7 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
  * Create functions malloc() the data structure.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,
-		unsigned int session_id, struct lttng_domain *domain);
+		unsigned int session_id);
 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
 		char *path);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
@@ -189,8 +172,8 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 }
 
 static inline
-struct ltt_ust_session *trace_ust_create_session(char *path, pid_t pid,
-		struct lttng_domain *domain)
+struct ltt_ust_session *trace_ust_create_session(char *path,
+		unsigned int session_id)
 {
 	return NULL;
 }