Cleanup: rename session list count to "next_uuid"

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index bcdd78d50e68b921f47ceb4038311c625aee875d..2181c0dd58fc5b4ccb33f9a5c4ae10fe7bda2ff0 100644 (file)
--- 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) {
@@ -214,13 +204,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 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;
+                       }
                }
        }
 
@@ -241,7 +234,6 @@ error_asprintf:
                free(new_session);
        }
 
-error_exist:
 error_malloc:
        return ret;
 }