X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=0086d748f0c6fe17fd54e87ccffdf7384f2ae447;hp=e1426f116ccc939c5f343343993ff4d70d3ea288;hb=6b584c2ece62c620a86cf438bb358a9da7962b7e;hpb=d9c6b5f258e9b72fb1da7492f4001dd0976e9886

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index e1426f116..0086d748f 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -4772,12 +4772,11 @@ enum lttcomm_return_code lttng_consumer_trace_chunk_exists(
 {
 	int ret;
 	enum lttcomm_return_code ret_code;
-	struct lttng_trace_chunk *chunk;
 	char relayd_id_buffer[MAX_INT_DEC_LEN(*relayd_id)];
 	const char *relayd_id_str = "(none)";
 	const bool is_local_trace = !relayd_id;
 	struct consumer_relayd_sock_pair *relayd = NULL;
-	bool chunk_exists_remote;
+	bool chunk_exists_local, chunk_exists_remote;
 
 	if (relayd_id) {
 		int ret;
@@ -4795,13 +4794,19 @@ enum lttcomm_return_code lttng_consumer_trace_chunk_exists(
 	DBG("Consumer trace chunk exists command: relayd_id = %s"
 			", chunk_id = %" PRIu64, relayd_id_str,
 			chunk_id);
-	chunk = lttng_trace_chunk_registry_find_chunk(
+	ret = lttng_trace_chunk_registry_chunk_exists(
 			consumer_data.chunk_registry, session_id,
-			chunk_id);
-	DBG("Trace chunk %s locally", chunk ? "exists" : "does not exist");
-	if (chunk) {
+			chunk_id, &chunk_exists_local);
+	if (ret) {
+		/* Internal error. */
+		ERR("Failed to query the existence of a trace chunk");
+		ret_code = LTTCOMM_CONSUMERD_FATAL;
+		goto end_rcu_unlock;
+	}
+	DBG("Trace chunk %s locally",
+			chunk_exists_local ? "exists" : "does not exist");
+	if (chunk_exists_local) {
 		ret_code = LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_LOCAL;
-		lttng_trace_chunk_put(chunk);
 		goto end;
 	} else if (is_local_trace) {
 		ret_code = LTTCOMM_CONSUMERD_UNKNOWN_TRACE_CHUNK;