X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=e4c747f7fd8e54583815ccb199e926aae226c611;hp=076d2cbc46ea9243dbe636350d01592e6d40a880;hb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883;hpb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 076d2cbc4..e4c747f7f 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,7 +55,7 @@ static struct ltt_session_list ltt_session_list = {
  * The caller MUST acquire the session list lock before.
  * Returns the unique identifier for the session.
  */
-static unsigned int add_session_list(struct ltt_session *ls)
+static uint64_t add_session_list(struct ltt_session *ls)
 {
 	assert(ls);
 
@@ -147,6 +148,7 @@ found:
  * Delete session from the session list and free the memory.
  *
  * Return -1 if no session is found.  On success, return 1;
+ * Should *NOT* be called with RCU read-side lock held.
  */
 int session_destroy(struct ltt_session *session)
 {
@@ -157,9 +159,8 @@ int session_destroy(struct ltt_session *session)
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
 
-	rcu_read_lock();
 	consumer_destroy_output(session->consumer);
-	rcu_read_unlock();
+	snapshot_destroy(&session->snapshot);
 	free(session);
 
 	return LTTNG_OK;
@@ -168,7 +169,7 @@ int session_destroy(struct ltt_session *session)
 /*
  * Create a brand new session and add it to the session list.
  */
-int session_create(char *name, char *path, uid_t uid, gid_t gid)
+int session_create(char *name, uid_t uid, gid_t gid)
 {
 	int ret;
 	struct ltt_session *new_session;
@@ -193,12 +194,9 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 		goto error;
 	}
 
-	/* Define session system path */
-	if (path != NULL) {
-		if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) {
-			ret = LTTNG_ERR_FATAL;
-			goto error_asprintf;
-		}
+	ret = gethostname(new_session->hostname, sizeof(new_session->hostname));
+	if (ret && errno == ENAMETOOLONG) {
+		new_session->hostname[HOST_NAME_MAX - 1] = '\0';
 	}
 
 	/* Init kernel session */
@@ -211,17 +209,10 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	new_session->uid = uid;
 	new_session->gid = gid;
 
-	/* Mkdir if we have a valid path and length */
-	if (strlen(new_session->path) > 0) {
-		ret = run_as_mkdir_recursive(new_session->path, S_IRWXU | S_IRWXG,
-				new_session->uid, new_session->gid);
-		if (ret < 0) {
-			if (ret != -EEXIST) {
-				ERR("Trace directory creation error");
-				ret = LTTNG_ERR_CREATE_DIR_FAIL;
-				goto error;
-			}
-		}
+	ret = snapshot_init(&new_session->snapshot);
+	if (ret < 0) {
+		ret = LTTNG_ERR_NOMEM;
+		goto error;
 	}
 
 	/* Add new session to the session list */
@@ -234,8 +225,8 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	 * up and, if valid, assign it to the session.
 	 */
 
-	DBG("Tracing session %s created in %s with ID %u by UID %d GID %d", name,
-			path, new_session->id, new_session->uid, new_session->gid);
+	DBG("Tracing session %s created with ID %" PRIu64 " by UID %d GID %d",
+			name, new_session->id, new_session->uid, new_session->gid);
 
 	return LTTNG_OK;