X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=944743e0b585ba9458ba9e681aa974f80335fd56;hb=9d16fc7fa401926b800c18124756d75b11b5b806;hp=6770bd982db393a45bdfda698614a1af2b4a6b54;hpb=1a414e3a88844a96aa23842822150ac44c391ed2;p=lttng-tools.git

diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c
index 6770bd982..944743e0b 100644
--- a/src/common/trace-chunk.c
+++ b/src/common/trace-chunk.c
@@ -367,6 +367,7 @@ end:
 	return new_chunk;
 error_unlock:
 	pthread_mutex_unlock(&source_chunk->lock);
+	lttng_trace_chunk_put(new_chunk);
 	return NULL;
 }
 
@@ -839,7 +840,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_open_file(
 			chunk->credentials.value.use_current_user ?
 					NULL : &chunk->credentials.value.user);
 	if (ret < 0) {
-		ERR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
+		PERROR("Failed to open file relative to trace chunk file_path = \"%s\", flags = %d, mode = %d",
 				file_path, flags, (int) mode);
 		status = LTTNG_TRACE_CHUNK_STATUS_ERROR;
 		goto end;
@@ -974,6 +975,7 @@ void lttng_trace_chunk_move_to_completed(struct lttng_trace_chunk *trace_chunk)
 				creation_timestamp, NULL);
 		if (!directory_to_rename) {
 			ERR("Failed to generate initial trace chunk name while renaming trace chunk");
+			goto end;
 		}
 		free_directory_to_rename = true;
 	}
@@ -1267,7 +1269,7 @@ lttng_trace_chunk_registry_publish_chunk(
 				 *
 				 * Re-attempt to publish.
 				 */
-				ERR("Attemp to publish a trace chunk to the chunk registry raced with a trace chunk deletion");
+				ERR("Attempt to publish a trace chunk to the chunk registry raced with a trace chunk deletion");
 				continue;
 			}
 		}
@@ -1357,6 +1359,41 @@ 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)
+{
+	int ret = 0;
+	const struct lttng_trace_chunk_registry_element target_element = {
+		.chunk.id.is_set = true,
+		.chunk.id.value = chunk_id,
+		.session_id = session_id,
+	};
+	const unsigned long element_hash =
+			lttng_trace_chunk_registry_element_hash(
+				&target_element);
+	struct cds_lfht_node *published_node;
+	struct cds_lfht_iter iter;
+
+	rcu_read_lock();
+	cds_lfht_lookup(registry->ht,
+			element_hash,
+			lttng_trace_chunk_registry_element_match,
+			&target_element,
+			&iter);
+	published_node = cds_lfht_iter_get_node(&iter);
+	if (!published_node) {
+		*chunk_exists = false;
+		goto end;
+	}
+
+	*chunk_exists = !cds_lfht_is_node_deleted(published_node);
+end:
+	rcu_read_unlock();
+	return ret;
+}
+
 LTTNG_HIDDEN
 struct lttng_trace_chunk *
 lttng_trace_chunk_registry_find_anonymous_chunk(