X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ffd-tracker%2Ffd-tracker.c;h=a9921fa847eff9d6c361b772ad34b224ac13e932;hb=f895927f329180ca1e6f4426e9d3c6250ae698ba;hp=188abfb6d2792f4f3f2eb9d899e6fb62d784f522;hpb=dd95933f8371a8c81ffc1dc5b306f2263f1ff808;p=lttng-tools.git

diff --git a/src/common/fd-tracker/fd-tracker.c b/src/common/fd-tracker/fd-tracker.c
index 188abfb6d..a9921fa84 100644
--- a/src/common/fd-tracker/fd-tracker.c
+++ b/src/common/fd-tracker/fd-tracker.c
@@ -232,7 +232,7 @@ static int fs_handle_tracked_suspend(struct fs_handle_tracked *handle)
 	pthread_mutex_lock(&handle->lock);
 	lttng_inode_borrow_location(
 			handle->inode, &node_directory_handle, &path);
-	assert(handle->fd >= 0);
+	LTTNG_ASSERT(handle->fd >= 0);
 	if (handle->in_use) {
 		/* This handle can't be suspended as it is currently in use. */
 		ret = -EAGAIN;
@@ -292,8 +292,8 @@ static int fs_handle_tracked_restore(struct fs_handle_tracked *handle)
 	lttng_inode_borrow_location(
 			handle->inode, &node_directory_handle, &path);
 
-	assert(handle->fd == -1);
-	assert(path);
+	LTTNG_ASSERT(handle->fd == -1);
+	LTTNG_ASSERT(path);
 	ret = open_from_properties(
 			node_directory_handle, path, &handle->properties);
 	if (ret < 0) {
@@ -457,6 +457,9 @@ int fd_tracker_destroy(struct fd_tracker *tracker)
 {
 	int ret = 0;
 
+	if (!tracker) {
+		goto end;
+	}
 	/*
 	 * Refuse to destroy the tracker as fs_handles may still old
 	 * weak references to the tracker.
@@ -474,7 +477,7 @@ int fd_tracker_destroy(struct fd_tracker *tracker)
 
 	if (tracker->unsuspendable_fds) {
 		ret = cds_lfht_destroy(tracker->unsuspendable_fds, NULL);
-		assert(!ret);
+		LTTNG_ASSERT(!ret);
 	}
 
 	lttng_inode_registry_destroy(tracker->inode_registry);
@@ -634,7 +637,7 @@ int fd_tracker_open_unsuspendable_fd(struct fd_tracker *tracker,
 		} else {
 			/*
 			 * There are not enough active suspendable file
-			 * descriptors to open a new fd and still accomodate the
+			 * descriptors to open a new fd and still accommodates the
 			 * tracker's capacity.
 			 */
 			WARN("Cannot open unsuspendable fd, too many unsuspendable file descriptors are opened (%u)",
@@ -831,7 +834,7 @@ static int fs_handle_tracked_get_fd(struct fs_handle *_handle)
 	 */
 	pthread_mutex_lock(&handle->tracker->lock);
 	pthread_mutex_lock(&handle->lock);
-	assert(!handle->in_use);
+	LTTNG_ASSERT(!handle->in_use);
 
 	handle->tracker->stats.uses++;
 	if (handle->fd >= 0) {
@@ -925,7 +928,7 @@ static int fs_handle_tracked_close(struct fs_handle *_handle)
 		 * isn't much the user can do about it.
 		 */
 		if (close(handle->fd)) {
-			PERROR("Failed to close the file descritptor (%d) of fs handle to %s, close() returned",
+			PERROR("Failed to close the file descriptor (%d) of fs handle to %s, close() returned",
 					handle->fd, path ? path : "Unknown");
 		}
 		handle->fd = -1;