Make lttng_directory_handle reference countable

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

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 05a1dc215f6d01d070a416cdb2ec483f314072d0..df6bc102ae19d434464c636d815959ff65bbe924 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -19,9 +19,10 @@
 
 #define _LGPL_SOURCE
 #include <common/common.h>
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 #include <common/time.h>
 #include <common/utils.h>
+#include <common/uuid.h>
 #include <urcu/rculist.h>
 
 #include <sys/stat.h>
@@ -184,10 +185,10 @@ static int session_set_anonymous_chunk(struct relay_session *session)
        int ret = 0;
        struct lttng_trace_chunk *chunk = NULL;
        enum lttng_trace_chunk_status status;
-       struct lttng_directory_handle output_directory;
+       struct lttng_directory_handle *output_directory;
 
-       ret = session_init_output_directory_handle(session, &output_directory);
-       if (ret) {
+       output_directory = session_create_output_directory_handle(session);
+       if (!output_directory) {
                goto end;
        }
 
@@ -202,16 +203,17 @@ static int session_set_anonymous_chunk(struct relay_session *session)
                goto end;
        }
 
-       status = lttng_trace_chunk_set_as_owner(chunk, &output_directory);
+       status = lttng_trace_chunk_set_as_owner(chunk, output_directory);
        if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                ret = -1;
                goto end;
        }
+       output_directory = NULL;
        session->current_trace_chunk = chunk;
        chunk = NULL;
 end:
        lttng_trace_chunk_put(chunk);
-       lttng_directory_handle_fini(&output_directory);
+       lttng_directory_handle_put(output_directory);
        return ret;
 }
 
@@ -328,7 +330,7 @@ struct relay_session *session_create(const char *session_name,
                                        session->id_sessiond.value,
                                        *current_chunk_id);
                if (!session->current_trace_chunk) {
-                       char uuid_str[UUID_STR_LEN];
+                       char uuid_str[LTTNG_UUID_STR_LEN];
 
                        lttng_uuid_to_str(sessiond_uuid, uuid_str);
                        ERR("Could not find trace chunk: sessiond = {%s}, sessiond session id = %" PRIu64 ", trace chunk id = %" PRIu64,
@@ -437,7 +439,7 @@ static void destroy_session(struct relay_session *session)
        call_rcu(&session->rcu_node, rcu_destroy_session);
 }
 
-void session_release(struct urcu_ref *ref)
+static void session_release(struct urcu_ref *ref)
 {
        struct relay_session *session =
                        caa_container_of(ref, struct relay_session, ref);
@@ -530,8 +532,8 @@ void print_sessions(void)
        rcu_read_unlock();
 }
 
-int session_init_output_directory_handle(struct relay_session *session,
-               struct lttng_directory_handle *handle)
+struct lttng_directory_handle *session_create_output_directory_handle(
+               struct relay_session *session)
 {
        int ret;
        /*
@@ -539,11 +541,11 @@ int session_init_output_directory_handle(struct relay_session *session,
         * e.g. /home/user/lttng-traces/hostname/session_name
         */
        char *full_session_path = NULL;
+       struct lttng_directory_handle *handle = NULL;
 
        pthread_mutex_lock(&session->lock);
        full_session_path = create_output_path(session->output_path);
        if (!full_session_path) {
-               ret = -1;
                goto end;
        }
 
@@ -555,12 +557,9 @@ int session_init_output_directory_handle(struct relay_session *session,
                goto end;
        }
 
-       ret = lttng_directory_handle_init(handle, full_session_path);
-       if (ret) {
-               goto end;
-       }
+       handle = lttng_directory_handle_create(full_session_path);
 end:
        pthread_mutex_unlock(&session->lock);
        free(full_session_path);
-       return ret;
+       return handle;
 }