X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=e445363ea03d214d90a4f4ded762ad9593d818b1;hp=bcdd78d50e68b921f47ceb4038311c625aee875d;hb=a4b92340642035d1eafeb1eead0ad01f64d2007d;hpb=fc4705fe99b46c430112590c66abd74e4191c388

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index bcdd78d50..e445363ea 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -45,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,
 };
 
 /*
@@ -57,7 +57,7 @@ static struct ltt_session_list ltt_session_list = {
 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++;
 }
 
 /*
@@ -68,10 +68,6 @@ static unsigned 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--;
-	}
 }
 
 /*
@@ -166,12 +162,6 @@ 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) {
@@ -198,10 +188,11 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 			ret = LTTCOMM_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 */
@@ -214,13 +205,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 = LTTCOMM_CREATE_DIR_FAIL;
+				goto error;
+			}
 		}
 	}
 
@@ -229,9 +223,13 @@ 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 %u 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.
+	 */
+
+	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 LTTCOMM_OK;
 
@@ -241,7 +239,6 @@ error_asprintf:
 		free(new_session);
 	}
 
-error_exist:
 error_malloc:
 	return ret;
 }