X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.c;h=5db920781b5009d1a0b2b462e8e96c2825c24243;hp=b96e585001c9bf7f420b0aac1ce274329550ce7c;hb=766048521f3bc7beb1209e2bb939ca2b42532a52;hpb=d7ba13889c8692b14f99238ddf2721ed78df89d2

diff --git a/src/bin/lttng-sessiond/buffer-registry.c b/src/bin/lttng-sessiond/buffer-registry.c
index b96e58500..5db920781 100644
--- a/src/bin/lttng-sessiond/buffer-registry.c
+++ b/src/bin/lttng-sessiond/buffer-registry.c
@@ -15,7 +15,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <inttypes.h>
 
@@ -74,10 +73,10 @@ no_match:
  * Hash function for the per UID registry hash table. This XOR the triplet
  * together.
  */
-static unsigned long ht_hash_reg_uid(void *_key, unsigned long seed)
+static unsigned long ht_hash_reg_uid(const void *_key, unsigned long seed)
 {
 	uint64_t xored_key;
-	struct buffer_reg_uid *key = _key;
+	const struct buffer_reg_uid *key = _key;
 
 	assert(key);
 
@@ -107,7 +106,7 @@ void buffer_reg_init_uid_registry(void)
  */
 int buffer_reg_uid_create(uint64_t session_id, uint32_t bits_per_long, uid_t uid,
 		enum lttng_domain_type domain, struct buffer_reg_uid **regp,
-		const char *shm_path)
+		const char *root_shm_path, const char *shm_path)
 {
 	int ret = 0;
 	struct buffer_reg_uid *reg = NULL;
@@ -133,6 +132,8 @@ int buffer_reg_uid_create(uint64_t session_id, uint32_t bits_per_long, uid_t uid
 	reg->uid = uid;
 	reg->domain = domain;
 	if (shm_path[0]) {
+		strncpy(reg->root_shm_path, root_shm_path, sizeof(reg->root_shm_path));
+		reg->root_shm_path[sizeof(reg->root_shm_path) - 1] = '\0';
 		strncpy(reg->shm_path, shm_path, sizeof(reg->shm_path));
 		reg->shm_path[sizeof(reg->shm_path) - 1] = '\0';
 		DBG3("shm path '%s' is assigned to uid buffer registry for session id %" PRIu64,
@@ -233,7 +234,7 @@ void buffer_reg_init_pid_registry(void)
  * Return 0 on success else a negative value and regp is untouched.
  */
 int buffer_reg_pid_create(uint64_t session_id, struct buffer_reg_pid **regp,
-		const char *shm_path)
+		const char *root_shm_path, const char *shm_path)
 {
 	int ret = 0;
 	struct buffer_reg_pid *reg = NULL;
@@ -257,6 +258,8 @@ int buffer_reg_pid_create(uint64_t session_id, struct buffer_reg_pid **regp,
 	/* A cast is done here so we can use the session ID as a u64 ht node. */
 	reg->session_id = session_id;
 	if (shm_path[0]) {
+		strncpy(reg->root_shm_path, root_shm_path, sizeof(reg->root_shm_path));
+		reg->root_shm_path[sizeof(reg->root_shm_path) - 1] = '\0';
 		strncpy(reg->shm_path, shm_path, sizeof(reg->shm_path));
 		reg->shm_path[sizeof(reg->shm_path) - 1] = '\0';
 		DBG3("shm path '%s' is assigned to pid buffer registry for session id %" PRIu64,
@@ -324,6 +327,43 @@ end:
 	return reg;
 }
 
+/*
+ * Find the consumer channel key from a UST session per-uid channel key.
+ *
+ * Return the matching key or -1 if not found.
+ */
+int buffer_reg_uid_consumer_channel_key(
+		struct cds_list_head *buffer_reg_uid_list,
+		uint64_t chan_key, uint64_t *consumer_chan_key)
+{
+	struct lttng_ht_iter iter;
+	struct buffer_reg_uid *uid_reg = NULL;
+	struct buffer_reg_session *session_reg = NULL;
+	struct buffer_reg_channel *reg_chan;
+	int ret = -1;
+
+	rcu_read_lock();
+	/*
+	 * For the per-uid registry, we have to iterate since we don't have the
+	 * uid and bitness key.
+	 */
+	cds_list_for_each_entry(uid_reg, buffer_reg_uid_list, lnode) {
+		session_reg = uid_reg->registry;
+		cds_lfht_for_each_entry(session_reg->channels->ht,
+				&iter.iter, reg_chan, node.node) {
+			if (reg_chan->key == chan_key) {
+				*consumer_chan_key = reg_chan->consumer_key;
+				ret = 0;
+				goto end;
+			}
+		}
+	}
+
+end:
+	rcu_read_unlock();
+	return ret;
+}
+
 /*
  * Allocate and initialize a buffer registry channel with the given key. Set
  * regp with the object pointer.
@@ -463,7 +503,7 @@ void buffer_reg_stream_destroy(struct buffer_reg_stream *regp,
 	{
 		int ret;
 
-		ret = ust_ctl_release_object(-1, regp->obj.ust);
+		ret = ust_app_release_object(NULL, regp->obj.ust);
 		if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
 			ERR("Buffer reg stream release obj handle %d failed with ret %d",
 					regp->obj.ust->handle, ret);
@@ -523,7 +563,7 @@ void buffer_reg_channel_destroy(struct buffer_reg_channel *regp,
 		}
 
 		if (regp->obj.ust) {
-			ret = ust_ctl_release_object(-1, regp->obj.ust);
+			ret = ust_app_release_object(NULL, regp->obj.ust);
 			if (ret < 0 && ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
 				ERR("Buffer reg channel release obj handle %d failed with ret %d",
 						regp->obj.ust->handle, ret);