X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.h;h=a22009efa996263cf9a17b2fe08941b5a088f92a;hp=1500f74aa54b885c6cd9401f8797e06e9c0e3316;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=7972aab22f74b18faa168c0482216a3dd711a075

diff --git a/src/bin/lttng-sessiond/ust-registry.h b/src/bin/lttng-sessiond/ust-registry.h
index 1500f74aa..a22009efa 100644
--- a/src/bin/lttng-sessiond/ust-registry.h
+++ b/src/bin/lttng-sessiond/ust-registry.h
@@ -33,8 +33,12 @@ struct ust_app;
 
 struct ust_registry_session {
 	/*
-	 * With multiple writers and readers, use this lock to access the registry.
-	 * Can nest within the ust app session lock.
+	 * With multiple writers and readers, use this lock to access
+	 * the registry. Can nest within the ust app session lock.
+	 * Also acts as a registry serialization lock. Used by registry
+	 * readers to serialize the registry information sent from the
+	 * sessiond to the consumerd.
+	 * The consumer socket lock nests within this lock.
 	 */
 	pthread_mutex_t lock;
 	/* Next channel ID available for a newly registered channel. */
@@ -62,12 +66,19 @@ struct ust_registry_session {
 	size_t metadata_len, metadata_alloc_len;
 	/* Length of bytes sent to the consumer. */
 	size_t metadata_len_sent;
+
+	char shm_path[PATH_MAX];
+	char metadata_path[PATH_MAX];
+	int metadata_fd;	/* file-backed metadata FD */
+
 	/*
-	 * Hash table containing channels sent by the UST tracer. MUST be accessed
-	 * with a RCU read side lock acquired.
+	 * Hash table containing channels sent by the UST tracer. MUST
+	 * be accessed with a RCU read side lock acquired.
 	 */
 	struct lttng_ht *channels;
-	/* Unique key to identify the metadata on the consumer side. */
+	/*
+	 * Unique key to identify the metadata on the consumer side.
+	 */
 	uint64_t metadata_key;
 	/*
 	 * Indicates if the metadata is closed on the consumer side. This is to
@@ -107,6 +118,8 @@ struct ust_registry_channel {
 	size_t nr_ctx_fields;
 	struct ustctl_field *ctx_fields;
 	struct lttng_ht_node_u64 node;
+	/* For delayed reclaim */
+	struct rcu_head rcu_head;
 };
 
 /*
@@ -125,7 +138,6 @@ struct ust_registry_event {
 	size_t nr_fields;
 	struct ustctl_field *fields;
 	char *model_emf_uri;
-	struct lttng_ust_object_data *obj;
 	/*
 	 * Flag for this channel if the metadata was dumped once during
 	 * registration. 0 means no, 1 yes.
@@ -216,13 +228,19 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 		uint32_t uint32_t_alignment,
 		uint32_t uint64_t_alignment,
 		uint32_t long_alignment,
-		int byte_order);
+		int byte_order,
+		uint32_t major,
+		uint32_t minor,
+		const char *shm_path,
+		uid_t euid,
+		gid_t egid);
 void ust_registry_session_destroy(struct ust_registry_session *session);
 
 int ust_registry_create_event(struct ust_registry_session *session,
 		uint64_t chan_key, int session_objd, int channel_objd, char *name,
 		char *sig, size_t nr_fields, struct ustctl_field *fields, int loglevel,
-		char *model_emf_uri, int buffer_type, uint32_t *event_id_p);
+		char *model_emf_uri, int buffer_type, uint32_t *event_id_p,
+		struct ust_app *app);
 struct ust_registry_event *ust_registry_find_event(
 		struct ust_registry_channel *chan, char *name, char *sig);
 void ust_registry_destroy_event(struct ust_registry_channel *chan,
@@ -230,7 +248,7 @@ void ust_registry_destroy_event(struct ust_registry_channel *chan,
 
 /* app can be NULL for registry shared across applications. */
 int ust_metadata_session_statedump(struct ust_registry_session *session,
-		struct ust_app *app);
+		struct ust_app *app, uint32_t major, uint32_t minor);
 int ust_metadata_channel_statedump(struct ust_registry_session *session,
 		struct ust_registry_channel *chan);
 int ust_metadata_event_statedump(struct ust_registry_session *session,