X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=09f0f0983a37cef21893e263d0ab2528b1d709f5;hp=716b560a96ddbf9cd397147fe3ed01eb076781ad;hb=13e3b28009f1f922da6021e43254db86b78aa109;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 716b560a9..09f0f0983 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -4461,7 +4461,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 {
 	int ret;
 	enum lttcomm_return_code ret_code = LTTCOMM_CONSUMERD_SUCCESS;
-	struct lttng_trace_chunk *created_chunk, *published_chunk;
+	struct lttng_trace_chunk *created_chunk = NULL, *published_chunk = NULL;
 	enum lttng_trace_chunk_status chunk_status;
 	char relayd_id_buffer[MAX_INT_DEC_LEN(*relayd_id)];
 	char creation_timestamp_buffer[ISO8601_STR_LEN];
@@ -4516,7 +4516,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 	if (!created_chunk) {
 		ERR("Failed to create trace chunk");
 		ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-		goto end;
+		goto error;
 	}
 
 	if (chunk_override_name) {
@@ -4524,7 +4524,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 				chunk_override_name);
 		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-			goto end;
+			goto error;
 		}
 	}
 
@@ -4534,7 +4534,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ERR("Failed to set trace chunk credentials");
 			ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-			goto end;
+			goto error;
 		}
 		/*
 		 * The consumer daemon has no ownership of the chunk output
@@ -4545,7 +4545,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ERR("Failed to set trace chunk's directory handle");
 			ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-			goto end;
+			goto error;
 		}
 	}
 
@@ -4557,7 +4557,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 	if (!published_chunk) {
 		ERR("Failed to publish trace chunk");
 		ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-		goto end;
+		goto error;
 	}
 
 	rcu_read_lock();
@@ -4626,14 +4626,15 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 			}
 
 			ret_code = LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED;
-			goto error;
+			goto error_unlock;
 		}
 	}
-error:
+error_unlock:
 	rcu_read_unlock();
+error:
 	/* Release the reference returned by the "publish" operation. */
 	lttng_trace_chunk_put(published_chunk);
-end:
+	lttng_trace_chunk_put(created_chunk);
 	return ret_code;
 }
 
@@ -4771,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;
@@ -4794,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;
+	}
+	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;