Fix RCU-related hangs: incorrect lttng_ht_destroy use

[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 6fb6bd3602256abffe4b8f0922e0a9baeb57bc32..b6b24b76c3f9ae28cec31d3c9e3224351647a2ef 100644 (file)
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -147,6 +147,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 +158,7 @@ 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();
        free(session);
 
        return LTTNG_OK;
@@ -168,7 +167,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,19 +192,6 @@ 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;
-               }
-               new_session->start_consumer = 1;
-       } else {
-               /* No path indicates that there is no use for a consumer. */
-               new_session->start_consumer = 0;
-               new_session->path[0] = '\0';
-       }
-
        /* Init kernel session */
        new_session->kernel_session = NULL;
        new_session->ust_session = NULL;
@@ -216,19 +202,6 @@ 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;
-                       }
-               }
-       }
-
        /* Add new session to the session list */
        session_lock_list();
        new_session->id = add_session_list(new_session);
@@ -239,8 +212,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 %u by UID %d GID %d", name,
+                       new_session->id, new_session->uid, new_session->gid);
 
        return LTTNG_OK;