X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=a08cfd28928bdfbdfcaf3a01d2de65cc314608fb;hp=255a75cf75ee18f59e599a8d253087946b2bf3ac;hb=31746f9311cefdd95109e231b78d6bd5fc12e85c;hpb=b34cbebfc8e60a678782bcffdf4ff8fc12de037e

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 255a75cf7..a08cfd289 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -102,6 +102,7 @@ struct ust_app_ctx {
 	struct lttng_ust_context ctx;
 	struct lttng_ust_object_data *obj;
 	struct lttng_ht_node_ulong node;
+	struct cds_list_head list;
 };
 
 struct ust_app_event {
@@ -141,7 +142,14 @@ struct ust_app_channel {
 	struct ust_app_stream_list streams;
 	/* Session pointer that owns this object. */
 	struct ust_app_session *session;
+	/*
+	 * Contexts are kept in a hash table for fast lookup and in an ordered list
+	 * so we are able to enable them on the tracer side in the same order the
+	 * user added them.
+	 */
 	struct lttng_ht *ctx;
+	struct cds_list_head ctx_list;
+
 	struct lttng_ht *events;
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
@@ -154,6 +162,8 @@ struct ust_app_channel {
 	 * ust_objd hash table in the ust_app object.
 	 */
 	struct lttng_ht_node_ulong ust_objd_node;
+	/* For delayed reclaim */
+	struct rcu_head rcu_head;
 };
 
 struct ust_app_session {
@@ -173,10 +183,10 @@ struct ust_app_session {
 	 * Tracing session ID. Multiple ust app session can have the same tracing
 	 * session id making this value NOT unique to the object.
 	 */
-	int tracing_id;
+	uint64_t tracing_id;
 	uint64_t id;	/* Unique session identifier */
 	struct lttng_ht *channels; /* Registered channels */
-	struct lttng_ht_node_ulong node;
+	struct lttng_ht_node_u64 node;
 	char path[PATH_MAX];
 	/* UID/GID of the application owning the session */
 	uid_t uid;
@@ -193,6 +203,10 @@ struct ust_app_session {
 	enum lttng_buffer_type buffer_type;
 	/* ABI of the session. Same value as the application. */
 	uint32_t bits_per_long;
+	/* For delayed reclaim */
+	struct rcu_head rcu_head;
+	/* If the channel's streams have to be outputed or not. */
+	unsigned int output_traces;
 };
 
 /*
@@ -301,6 +315,10 @@ struct ust_app *ust_app_create(struct ust_register_msg *msg, int sock);
 void ust_app_notify_sock_unregister(int sock);
 ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
 		struct consumer_socket *socket, int send_zero_data);
+void ust_app_destroy(struct ust_app *app);
+int ust_app_snapshot_record(struct ltt_ust_session *usess,
+		struct snapshot_output *output, int wait, unsigned int nb_streams);
+unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -493,6 +511,22 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
 {
 	return 0;
 }
+static inline
+void ust_app_destroy(struct ust_app *app)
+{
+	return;
+}
+static inline
+int ust_app_snapshot_record(struct ltt_ust_session *usess,
+		struct snapshot_output *output, int wait, unsigned int nb_stream)
+{
+	return 0;
+}
+static inline
+unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess)
+{
+	return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */