X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=3f1390dc3df1e65449700c12fa502215a9e29426;hp=3f4a962c1014de3913f416e25d3ae6f94db1df21;hb=b4d096a6292e78c601dba161dbb15f48ad89935f;hpb=6c1c0768320135c6936c371b09731851b508c023

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 3f4a962c1..3f1390dc3 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -43,13 +43,13 @@ static int ht_match_event(struct cds_lfht_node *node, const void *_key)
 	key = _key;
 
 	/* It has to be a perfect match. */
-	if (strncmp(event->name, key->name, sizeof(event->name)) != 0) {
+	if (strncmp(event->name, key->name, sizeof(event->name))) {
 		goto no_match;
 	}
 
 	/* It has to be a perfect match. */
 	if (strncmp(event->signature, key->signature,
-				strlen(event->signature) != 0)) {
+			strlen(event->signature))) {
 		goto no_match;
 	}
 
@@ -546,7 +546,11 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 		uint32_t long_alignment,
 		int byte_order,
 		uint32_t major,
-		uint32_t minor)
+		uint32_t minor,
+		const char *root_shm_path,
+		const char *shm_path,
+		uid_t euid,
+		gid_t egid)
 {
 	int ret;
 	struct ust_registry_session *session;
@@ -567,6 +571,43 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 	session->uint64_t_alignment = uint64_t_alignment;
 	session->long_alignment = long_alignment;
 	session->byte_order = byte_order;
+	session->metadata_fd = -1;
+	session->uid = euid;
+	session->gid = egid;
+	strncpy(session->root_shm_path, root_shm_path,
+		sizeof(session->root_shm_path));
+	session->root_shm_path[sizeof(session->root_shm_path) - 1] = '\0';
+	if (shm_path[0]) {
+		strncpy(session->shm_path, shm_path,
+			sizeof(session->shm_path));
+		session->shm_path[sizeof(session->shm_path) - 1] = '\0';
+		strncpy(session->metadata_path, shm_path,
+			sizeof(session->metadata_path));
+		session->metadata_path[sizeof(session->metadata_path) - 1] = '\0';
+		strncat(session->metadata_path, "/metadata",
+			sizeof(session->metadata_path)
+				- strlen(session->metadata_path) - 1);
+	}
+	if (session->shm_path[0]) {
+		ret = run_as_mkdir_recursive(session->shm_path,
+			S_IRWXU | S_IRWXG,
+			euid, egid);
+		if (ret) {
+			PERROR("run_as_mkdir_recursive");
+			goto error;
+		}
+	}
+	if (session->metadata_path[0]) {
+		/* Create metadata file */
+		ret = run_as_open(session->metadata_path,
+			O_WRONLY | O_CREAT | O_EXCL,
+			S_IRUSR | S_IWUSR, euid, egid);
+		if (ret < 0) {
+			PERROR("Opening metadata file");
+			goto error;
+		}
+		session->metadata_fd = ret;
+	}
 
 	session->channels = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
 	if (!session->channels) {
@@ -608,7 +649,9 @@ void ust_registry_session_destroy(struct ust_registry_session *reg)
 	struct lttng_ht_iter iter;
 	struct ust_registry_channel *chan;
 
-	assert(reg);
+	if (!reg) {
+		return;
+	}
 
 	/* On error, EBUSY can be returned if lock. Code flow error. */
 	ret = pthread_mutex_destroy(&reg->lock);
@@ -629,4 +672,22 @@ void ust_registry_session_destroy(struct ust_registry_session *reg)
 	}
 
 	free(reg->metadata);
+	if (reg->metadata_fd >= 0) {
+		ret = close(reg->metadata_fd);
+		if (ret) {
+			PERROR("close");
+		}
+		ret = run_as_unlink(reg->metadata_path,
+				reg->uid, reg->gid);
+		if (ret) {
+			PERROR("unlink");
+		}
+	}
+	if (reg->root_shm_path[0]) {
+		/*
+		 * Try deleting the directory hierarchy.
+		 */
+		(void) run_as_recursive_rmdir(reg->root_shm_path,
+				reg->uid, reg->gid);
+	}
 }