X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=7d0ee7d4abb82656d1f9493a58304d5e007bb7f5;hp=cf2ef463e8ce20404746ae7dda5a28e44f538b84;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hpb=d14d33bf091e72b23b1f90ea18a0a01bed098b76

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index cf2ef463e..7d0ee7d4a 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <urcu.h>
 
 #include <common/common.h>
@@ -46,7 +45,7 @@
 static struct ltt_session_list ltt_session_list = {
 	.head = CDS_LIST_HEAD_INIT(ltt_session_list.head),
 	.lock = PTHREAD_MUTEX_INITIALIZER,
-	.count = 0,
+	.next_uuid = 0,
 };
 
 /*
@@ -55,10 +54,10 @@ 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 int add_session_list(struct ltt_session *ls)
+static unsigned int add_session_list(struct ltt_session *ls)
 {
 	cds_list_add(&ls->list, &ltt_session_list.head);
-	return ++ltt_session_list.count;
+	return ltt_session_list.next_uuid++;
 }
 
 /*
@@ -69,10 +68,6 @@ static int add_session_list(struct ltt_session *ls)
 static void del_session_list(struct ltt_session *ls)
 {
 	cds_list_del(&ls->list);
-	/* Sanity check */
-	if (ltt_session_list.count > 0) {
-		ltt_session_list.count--;
-	}
 }
 
 /*
@@ -148,15 +143,19 @@ int session_destroy(struct ltt_session *session)
 	/* Safety check */
 	if (session == NULL) {
 		ERR("Session pointer was null on session destroy");
-		return LTTCOMM_OK;
+		return LTTNG_OK;
 	}
 
 	DBG("Destroying session %s", session->name);
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
+
+	rcu_read_lock();
+	consumer_destroy_output(session->consumer);
+	rcu_read_unlock();
 	free(session);
 
-	return LTTCOMM_OK;
+	return LTTNG_OK;
 }
 
 /*
@@ -167,42 +166,37 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	int ret;
 	struct ltt_session *new_session;
 
-	new_session = session_find_by_name(name);
-	if (new_session != NULL) {
-		ret = LTTCOMM_EXIST_SESS;
-		goto error_exist;
-	}
-
 	/* Allocate session data structure */
 	new_session = zmalloc(sizeof(struct ltt_session));
 	if (new_session == NULL) {
 		PERROR("zmalloc");
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error_malloc;
 	}
 
 	/* Define session name */
 	if (name != NULL) {
 		if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error_asprintf;
 		}
 	} else {
 		ERR("No session name given");
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
 	/* Define session system path */
 	if (path != NULL) {
 		if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error_asprintf;
 		}
+		new_session->start_consumer = 1;
 	} else {
-		ERR("No session path given");
-		ret = LTTCOMM_FATAL;
-		goto error;
+		/* No path indicates that there is no use for a consumer. */
+		new_session->start_consumer = 0;
+		new_session->path[0] = '\0';
 	}
 
 	/* Init kernel session */
@@ -215,13 +209,16 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	new_session->uid = uid;
 	new_session->gid = gid;
 
-	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 = LTTCOMM_CREATE_DIR_FAIL;
-			goto error;
+	/* 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;
+			}
 		}
 	}
 
@@ -230,11 +227,15 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	new_session->id = add_session_list(new_session);
 	session_unlock_list();
 
-	DBG("Tracing session %s created in %s with ID %d by UID %d GID %d",
-		name, path, new_session->id,
-		new_session->uid, new_session->gid);
+	/*
+	 * Consumer is let to NULL since the create_session_uri command will set it
+	 * up and, if valid, assign it to the session.
+	 */
 
-	return LTTCOMM_OK;
+	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);
+
+	return LTTNG_OK;
 
 error:
 error_asprintf:
@@ -242,7 +243,21 @@ error_asprintf:
 		free(new_session);
 	}
 
-error_exist:
 error_malloc:
 	return ret;
 }
+
+/*
+ * Check if the UID or GID match the session. Root user has access to all
+ * sessions.
+ */
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
+{
+	assert(session);
+
+	if (uid != session->uid && gid != session->gid && uid != 0) {
+		return 0;
+	} else {
+		return 1;
+	}
+}