X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=d04d51637e603fe763a067a3271917d1da5e80a7;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=8a8481b5d41e4ce77e0dbf21a53347d0fa39198a;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 8a8481b5d..d04d51637 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -12,6 +12,7 @@
 #include <common/error.h>
 #include <common/fd-tracker/fd-tracker.h>
 #include <common/fd-tracker/utils.h>
+#include <common/fs-handle.h>
 #include <common/fs-handle-internal.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
@@ -182,7 +183,7 @@ struct fs_handle *fs_handle_untracked_create(
 	bool reference_acquired;
 	char *path_copy = strdup(path);
 
-	assert(fd >= 0);
+	LTTNG_ASSERT(fd >= 0);
 	if (!path_copy) {
 		PERROR("Failed to copy file path while creating untracked filesystem handle");
 		goto end;
@@ -203,7 +204,7 @@ struct fs_handle *fs_handle_untracked_create(
 
 	handle->fd = fd;
 	reference_acquired = lttng_directory_handle_get(directory_handle);
-	assert(reference_acquired);
+	LTTNG_ASSERT(reference_acquired);
 	handle->location.directory_handle = directory_handle;
 	/* Ownership is transferred. */
 	handle->location.path = path_copy;
@@ -394,14 +395,12 @@ end:
 	return chunk;
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *lttng_trace_chunk_create_anonymous(void)
 {
 	DBG("Creating anonymous trace chunk");
 	return lttng_trace_chunk_allocate();
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *lttng_trace_chunk_create(
 		uint64_t chunk_id, time_t chunk_creation_time, const char *path)
 {
@@ -463,17 +462,15 @@ error:
 	return NULL;
 }
 
-LTTNG_HIDDEN
 void lttng_trace_chunk_set_fd_tracker(struct lttng_trace_chunk *chunk,
 		struct fd_tracker *fd_tracker)
 {
-	assert(!chunk->session_output_directory);
-	assert(!chunk->chunk_directory);
-	assert(lttng_dynamic_pointer_array_get_count(&chunk->files) == 0);
+	LTTNG_ASSERT(!chunk->session_output_directory);
+	LTTNG_ASSERT(!chunk->chunk_directory);
+	LTTNG_ASSERT(lttng_dynamic_pointer_array_get_count(&chunk->files) == 0);
 	chunk->fd_tracker = fd_tracker;
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *lttng_trace_chunk_copy(
 		struct lttng_trace_chunk *source_chunk)
 {
@@ -522,7 +519,7 @@ struct lttng_trace_chunk *lttng_trace_chunk_copy(
 		const bool reference_acquired = lttng_directory_handle_get(
 				source_chunk->session_output_directory);
 
-		assert(reference_acquired);
+		LTTNG_ASSERT(reference_acquired);
 		new_chunk->session_output_directory =
 				source_chunk->session_output_directory;
 	}
@@ -530,7 +527,7 @@ struct lttng_trace_chunk *lttng_trace_chunk_copy(
 		const bool reference_acquired = lttng_directory_handle_get(
 				source_chunk->chunk_directory);
 
-		assert(reference_acquired);
+		LTTNG_ASSERT(reference_acquired);
 		new_chunk->chunk_directory = source_chunk->chunk_directory;
 	}
 	new_chunk->close_command = source_chunk->close_command;
@@ -544,7 +541,6 @@ error_unlock:
 	return NULL;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_id(
 		struct lttng_trace_chunk *chunk, uint64_t *id)
 {
@@ -560,7 +556,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_id(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_creation_timestamp(
 		struct lttng_trace_chunk *chunk, time_t *creation_ts)
 
@@ -577,7 +572,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_creation_timestamp(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_close_timestamp(
 		struct lttng_trace_chunk *chunk, time_t *close_ts)
 {
@@ -593,7 +587,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_close_timestamp(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_close_timestamp(
 		struct lttng_trace_chunk *chunk, time_t close_ts)
 {
@@ -634,7 +627,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_name(
 		struct lttng_trace_chunk *chunk, const char **name,
 		bool *name_overridden)
@@ -655,7 +647,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 bool lttng_trace_chunk_get_name_overridden(struct lttng_trace_chunk *chunk)
 {
 	bool name_overridden;
@@ -687,7 +678,6 @@ bool is_valid_chunk_name(const char *name)
 	return true;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_override_name(
 		struct lttng_trace_chunk *chunk, const char *name)
 
@@ -880,7 +870,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock(
 		const bool reference_acquired = lttng_directory_handle_get(
 				chunk->session_output_directory);
 
-		assert(reference_acquired);
+		LTTNG_ASSERT(reference_acquired);
 		rename_directory = chunk->session_output_directory;
 
 		/* Move toplevel directories. */
@@ -942,7 +932,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_rename_path(
 		struct lttng_trace_chunk *chunk, const char *path)
 
@@ -956,7 +945,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_credentials(
 		struct lttng_trace_chunk *chunk,
 		struct lttng_credentials *credentials)
@@ -978,7 +966,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_credentials(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_credentials(
 		struct lttng_trace_chunk *chunk,
 		const struct lttng_credentials *user_credentials)
@@ -1000,7 +987,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_credentials_current_user(
 		struct lttng_trace_chunk *chunk)
 {
@@ -1021,7 +1007,6 @@ end:
 }
 
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 		struct lttng_trace_chunk *chunk,
 		struct lttng_directory_handle *session_output_directory)
@@ -1077,18 +1062,17 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner(
 		 * A nameless chunk does not need its own output directory.
 		 * The session's output directory will be used.
 		 */
-		const bool reference_acquired =
-				lttng_directory_handle_get(
-					session_output_directory);
+		reference_acquired = lttng_directory_handle_get(
+				session_output_directory);
 
-		assert(reference_acquired);
+		LTTNG_ASSERT(reference_acquired);
 		chunk_directory_handle = session_output_directory;
 	}
 	chunk->chunk_directory = chunk_directory_handle;
 	chunk_directory_handle = NULL;
 	reference_acquired = lttng_directory_handle_get(
 			session_output_directory);
-	assert(reference_acquired);
+	LTTNG_ASSERT(reference_acquired);
 	chunk->session_output_directory = session_output_directory;
 	LTTNG_OPTIONAL_SET(&chunk->mode, TRACE_CHUNK_MODE_OWNER);
 end:
@@ -1096,7 +1080,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_as_user(
 		struct lttng_trace_chunk *chunk,
 		struct lttng_directory_handle *chunk_directory)
@@ -1115,7 +1098,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_user(
 		goto end;
 	}
 	reference_acquired = lttng_directory_handle_get(chunk_directory);
-	assert(reference_acquired);
+	LTTNG_ASSERT(reference_acquired);
 	chunk->chunk_directory = chunk_directory;
 	LTTNG_OPTIONAL_SET(&chunk->mode, TRACE_CHUNK_MODE_USER);
 end:
@@ -1123,7 +1106,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status
 lttng_trace_chunk_get_session_output_directory_handle(
 		struct lttng_trace_chunk *chunk,
@@ -1140,7 +1122,7 @@ lttng_trace_chunk_get_session_output_directory_handle(
 		const bool reference_acquired = lttng_directory_handle_get(
 				chunk->session_output_directory);
 
-		assert(reference_acquired);
+		LTTNG_ASSERT(reference_acquired);
 		*handle = chunk->session_output_directory;
 	}
 end:
@@ -1148,7 +1130,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_borrow_chunk_directory_handle(
 		struct lttng_trace_chunk *chunk,
 		const struct lttng_directory_handle **handle)
@@ -1216,7 +1197,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_create_subdirectory(
 		struct lttng_trace_chunk *chunk,
 		const char *path)
@@ -1347,7 +1327,7 @@ void lttng_trace_chunk_remove_file(
 	}
 	ret = lttng_dynamic_pointer_array_remove_pointer(
 			&chunk->files, index);
-	assert(!ret);
+	LTTNG_ASSERT(!ret);
 }
 
 static
@@ -1384,7 +1364,7 @@ enum lttng_trace_chunk_status _lttng_trace_chunk_open_fs_handle_locked(
 		goto end;
 	}
 	if (chunk->fd_tracker) {
-		assert(chunk->credentials.value.use_current_user);
+		LTTNG_ASSERT(chunk->credentials.value.use_current_user);
 		*out_handle = fd_tracker_open_fs_handle(chunk->fd_tracker,
 				chunk->chunk_directory, file_path, flags, &mode);
 		ret = *out_handle ? 0 : -1;
@@ -1418,7 +1398,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_open_fs_handle(
 		struct lttng_trace_chunk *chunk,
 		const char *file_path,
@@ -1436,7 +1415,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_fs_handle(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 		struct lttng_trace_chunk *chunk,
 		const char *file_path,
@@ -1453,7 +1431,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 	 * Using this method is never valid when an fd_tracker is being
 	 * used since the resulting file descriptor would not be tracked.
 	 */
-	assert(!chunk->fd_tracker);
+	LTTNG_ASSERT(!chunk->fd_tracker);
 	status = _lttng_trace_chunk_open_fs_handle_locked(chunk, file_path,
 			flags, mode, &fs_handle, expect_no_file);
 	pthread_mutex_unlock(&chunk->lock);
@@ -1470,7 +1448,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 	return status;
 }
 
-LTTNG_HIDDEN
 int lttng_trace_chunk_unlink_file(struct lttng_trace_chunk *chunk,
 		const char *file_path)
 {
@@ -1572,9 +1549,9 @@ int lttng_trace_chunk_move_to_completed_post_release(
 		goto end;
 	}
 
-	assert(trace_chunk->mode.value == TRACE_CHUNK_MODE_OWNER);
-	assert(!trace_chunk->name_overridden);
-	assert(trace_chunk->path);
+	LTTNG_ASSERT(trace_chunk->mode.value == TRACE_CHUNK_MODE_OWNER);
+	LTTNG_ASSERT(!trace_chunk->name_overridden);
+	LTTNG_ASSERT(trace_chunk->path);
 
 	archived_chunk_name = generate_chunk_name(chunk_id, creation_timestamp,
 			&close_timestamp);
@@ -1696,8 +1673,8 @@ int lttng_trace_chunk_delete_post_release_owner(
 
 	DBG("Trace chunk \"delete\" close command post-release (Owner)");
 
-	assert(trace_chunk->session_output_directory);
-	assert(trace_chunk->chunk_directory);
+	LTTNG_ASSERT(trace_chunk->session_output_directory);
+	LTTNG_ASSERT(trace_chunk->chunk_directory);
 
 	/* Remove empty directories. */
 	count = lttng_dynamic_pointer_array_get_count(
@@ -1758,7 +1735,6 @@ int lttng_trace_chunk_delete_post_release(
 	}
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_get_close_command(
 		struct lttng_trace_chunk *chunk,
 		enum lttng_trace_chunk_command_type *command_type)
@@ -1776,7 +1752,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_get_close_command(
 	return status;
 }
 
-LTTNG_HIDDEN
 enum lttng_trace_chunk_status lttng_trace_chunk_set_close_command(
 		struct lttng_trace_chunk *chunk,
 		enum lttng_trace_chunk_command_type close_command)
@@ -1812,7 +1787,6 @@ end:
 	return status;
 }
 
-LTTNG_HIDDEN
 const char *lttng_trace_chunk_command_type_get_name(
 		enum lttng_trace_chunk_command_type command)
 {
@@ -1828,7 +1802,6 @@ const char *lttng_trace_chunk_command_type_get_name(
 	}
 }
 
-LTTNG_HIDDEN
 bool lttng_trace_chunk_ids_equal(const struct lttng_trace_chunk *chunk_a,
 		const struct lttng_trace_chunk *chunk_b)
 {
@@ -1859,7 +1832,6 @@ end:
 	return equal;
 }
 
-LTTNG_HIDDEN
 bool lttng_trace_chunk_get(struct lttng_trace_chunk *chunk)
 {
 	return urcu_ref_get_unless_zero(&chunk->ref);
@@ -1912,17 +1884,15 @@ void lttng_trace_chunk_release(struct urcu_ref *ref)
 	}
 }
 
-LTTNG_HIDDEN
 void lttng_trace_chunk_put(struct lttng_trace_chunk *chunk)
 {
 	if (!chunk) {
 		return;
 	}
-	assert(chunk->ref.refcount);
+	LTTNG_ASSERT(chunk->ref.refcount);
 	urcu_ref_put(&chunk->ref, lttng_trace_chunk_release);
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk_registry *lttng_trace_chunk_registry_create(void)
 {
 	struct lttng_trace_chunk_registry *registry;
@@ -1944,7 +1914,6 @@ error:
 	return NULL;
 }
 
-LTTNG_HIDDEN
 void lttng_trace_chunk_registry_destroy(
 		struct lttng_trace_chunk_registry *registry)
 {
@@ -1953,7 +1922,7 @@ void lttng_trace_chunk_registry_destroy(
 	}
 	if (registry->ht) {
 		int ret = cds_lfht_destroy(registry->ht, NULL);
-		assert(!ret);
+		LTTNG_ASSERT(!ret);
 	}
 	free(registry);
 }
@@ -1997,7 +1966,6 @@ end:
 	return element;
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *
 lttng_trace_chunk_registry_publish_chunk(
 		struct lttng_trace_chunk_registry *registry,
@@ -2124,7 +2092,6 @@ end:
 	return published_chunk;
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *
 lttng_trace_chunk_registry_find_chunk(
 		const struct lttng_trace_chunk_registry *registry,
@@ -2134,7 +2101,6 @@ lttng_trace_chunk_registry_find_chunk(
 			session_id, &chunk_id);
 }
 
-LTTNG_HIDDEN
 int lttng_trace_chunk_registry_chunk_exists(
 		const struct lttng_trace_chunk_registry *registry,
 		uint64_t session_id, uint64_t chunk_id, bool *chunk_exists)
@@ -2169,7 +2135,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 struct lttng_trace_chunk *
 lttng_trace_chunk_registry_find_anonymous_chunk(
 		const struct lttng_trace_chunk_registry *registry,
@@ -2179,7 +2144,6 @@ lttng_trace_chunk_registry_find_anonymous_chunk(
 			session_id, NULL);
 }
 
-LTTNG_HIDDEN
 unsigned int lttng_trace_chunk_registry_put_each_chunk(
 		const struct lttng_trace_chunk_registry *registry)
 {