Make lttng_directory_handle reference countable

[lttng-tools.git] / src / common / consumer / consumer.c

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 1ea682f028e76ebe546b3dc892981bc10d2009a5..00eb35670d7731c11048b2a6bbd7a9573cf538df 100644 (file)
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -709,11 +709,6 @@ void consumer_add_data_stream(struct lttng_consumer_stream *stream)
        pthread_mutex_unlock(&consumer_data.lock);
 }
 
-void consumer_del_data_stream(struct lttng_consumer_stream *stream)
-{
-       consumer_del_stream(stream, data_ht);
-}
-
 /*
  * Add relayd socket to global consumer data hashtable. RCU read side lock MUST
  * be acquired before calling this.
@@ -2179,6 +2174,7 @@ int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
        }
 }
 
+static
 void lttng_consumer_close_all_metadata(void)
 {
        switch (consumer_data.type) {
@@ -4360,7 +4356,7 @@ enum lttcomm_return_code lttng_consumer_init_command(
                const lttng_uuid sessiond_uuid)
 {
        enum lttcomm_return_code ret;
-       char uuid_str[UUID_STR_LEN];
+       char uuid_str[LTTNG_UUID_STR_LEN];
 
        if (ctx->sessiond_uuid.is_set) {
                ret = LTTCOMM_CONSUMERD_ALREADY_SET;
@@ -4467,6 +4463,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
                 */
                chunk_status = lttng_trace_chunk_set_as_user(created_chunk,
                                chunk_directory_handle);
+               chunk_directory_handle = NULL;
                if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                        ERR("Failed to set trace chunk's directory handle");
                        ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;