relayd: track directory handles through the fd-tracker

[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 d838385210389642950213d8fe5b68a47a586a97..daae9a55ba1d5308427a101f16e2416e9f4d46bb 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -1,29 +1,19 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
 #include <common/common.h>
-#include <common/uuid.h>
+#include <common/compat/path.h>
+#include <common/fd-tracker/utils.h>
 #include <common/time.h>
 #include <common/utils.h>
 #include <common/uuid.h>
-#include <common/compat/path.h>
 #include <urcu/rculist.h>
 
 #include <sys/stat.h>
@@ -206,7 +196,7 @@ static struct lttng_directory_handle *session_create_output_directory_handle(
                goto end;
        }
 
-       handle = lttng_directory_handle_create(full_session_path);
+       handle = fd_tracker_create_directory_handle(the_fd_tracker, full_session_path);
 end:
        pthread_mutex_unlock(&session->lock);
        free(full_session_path);
@@ -241,6 +231,8 @@ static int session_set_anonymous_chunk(struct relay_session *session)
                ret = -1;
                goto end;
        }
+
+       lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
        output_directory = NULL;
        session->current_trace_chunk = chunk;
        chunk = NULL;