X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=ea952220b880ad4a12e106a13c90973cfdda1d19;hp=f045b50a950988acac7c6a4f025e4fccb13f6d70;hb=a3a75bf4721736ec16c30ee70de95e773fedf53b;hpb=8bb66c3cd60938352927ee865759433387324250

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index f045b50a9..ea952220b 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <common/compat/directory-handle.h>
@@ -21,6 +11,7 @@
 #include <common/dynamic-array.h>
 #include <common/error.h>
 #include <common/fd-tracker/fd-tracker.h>
+#include <common/fd-tracker/utils.h>
 #include <common/fs-handle-internal.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
@@ -775,7 +766,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		goto skip_move;
 	}
 
-	if (old_path[0] != '\0' && path[0] != '\0') {
+	if (old_path && old_path[0] != '\0' && path[0] != '\0') {
 		/* Rename chunk directory. */
 		ret = lttng_directory_handle_rename_as_user(
 			chunk->session_output_directory,
@@ -791,9 +782,14 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
 			goto end;
 		}
-		rename_directory = lttng_directory_handle_create_from_handle(
-				path,
-				chunk->session_output_directory);
+		rename_directory = chunk->fd_tracker ?
+				fd_tracker_create_directory_handle_from_handle(
+						chunk->fd_tracker,
+						chunk->session_output_directory,
+						path) :
+				lttng_directory_handle_create_from_handle(
+						path,
+						chunk->session_output_directory);
 		if (!rename_directory) {
 			ERR("Failed to get handle to trace chunk rename directory");
 			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
@@ -808,7 +804,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		 */
 		chunk->chunk_directory = rename_directory;
 		rename_directory = NULL;
-	} else if (old_path[0] == '\0') {
+	} else if (old_path && old_path[0] == '\0') {
 		size_t i, count = lttng_dynamic_pointer_array_get_count(
 				&chunk->top_level_directories);
 
@@ -863,7 +859,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		 */
 		chunk->chunk_directory = rename_directory;
 		rename_directory = NULL;
-	} else {
+	} else if (old_path) {
 		size_t i, count = lttng_dynamic_pointer_array_get_count(
 				&chunk->top_level_directories);
 		const bool reference_acquired = lttng_directory_handle_get(
@@ -912,18 +908,18 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 			ret = -1;
 			goto end;
 		}
+	} else {
+		/* Unexpected !old_path && !path. */
+		status = LTTNG_TRACE_CHUNK_STATUS_INVALID_ARGUMENT;
+		goto end;
 	}
 
 skip_move:
-	if (path) {
-		new_path = strdup(path);
-		if (!new_path) {
-			ERR("Failed to allocate new trace chunk path");
-			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
-			goto end;
-		}
-	} else {
-		new_path = NULL;
+	new_path = strdup(path);
+	if (!new_path) {
+		ERR("Failed to allocate new trace chunk path");
+		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
+		goto end;
 	}
 	free(chunk->path);
 	chunk->path = new_path;
@@ -1049,9 +1045,14 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 			goto end;
 		}
 		chunk_directory_handle =
-				lttng_directory_handle_create_from_handle(
-					chunk->path,
-					session_output_directory);
+				chunk->fd_tracker ?
+					fd_tracker_create_directory_handle_from_handle(
+							chunk->fd_tracker,
+							session_output_directory,
+							chunk->path) :
+					lttng_directory_handle_create_from_handle(
+							chunk->path,
+							session_output_directory);
 		if (!chunk_directory_handle) {
 			/* The function already logs on all error paths. */
 			status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
@@ -1582,9 +1583,14 @@ int lttng_trace_chunk_move_to_completed_post_release(
 		goto end;
 	}
 
-	archived_chunks_directory = lttng_directory_handle_create_from_handle(
-		        DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY,
-			trace_chunk->session_output_directory);
+	archived_chunks_directory = trace_chunk->fd_tracker ?
+			fd_tracker_create_directory_handle_from_handle(
+					trace_chunk->fd_tracker,
+					trace_chunk->session_output_directory,
+					DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY) :
+			lttng_directory_handle_create_from_handle(
+					DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY,
+					trace_chunk->session_output_directory);
 	if (!archived_chunks_directory) {
 		PERROR("Failed to get handle to archived trace chunks directory");
 		ret = -1;