From: David Goulet <dgoulet@efficios.com>
Date: Mon, 22 Oct 2012 20:37:10 +0000 (-0400)
Subject: Fix: Set a single return point and mutex unlock
X-Git-Tag: v2.1.0-rc6~33
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6efae65ee1d5c6b048f0f4cd778d784d3857e459;p=lttng-tools.git

Fix: Set a single return point and mutex unlock

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 4e000fbd1..249df8a47 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -502,7 +502,9 @@ int lttng_kconsumer_data_available(struct lttng_consumer_stream *stream)
 	 */
 	ret = pthread_mutex_trylock(&stream->lock);
 	if (ret == EBUSY) {
-		goto data_not_available;
+		/* Data not available */
+		ret = 0;
+		goto end;
 	}
 	/* The stream is now locked so we can do our ustctl calls */
 
@@ -511,14 +513,14 @@ int lttng_kconsumer_data_available(struct lttng_consumer_stream *stream)
 		/* There is still data so let's put back this subbuffer. */
 		ret = kernctl_put_subbuf(stream->wait_fd);
 		assert(ret == 0);
-		pthread_mutex_unlock(&stream->lock);
-		goto data_not_available;
+		goto end_unlock;
 	}
 
 	/* Data is available to be read for this stream. */
-	pthread_mutex_unlock(&stream->lock);
-	return 1;
+	ret = 1;
 
-data_not_available:
-	return 0;
+end_unlock:
+	pthread_mutex_unlock(&stream->lock);
+end:
+	return ret;
 }
diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index c2ad0fdd8..e8e3f9396 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -545,7 +545,9 @@ int lttng_ustconsumer_data_available(struct lttng_consumer_stream *stream)
 	 */
 	ret = pthread_mutex_trylock(&stream->lock);
 	if (ret == EBUSY) {
-		goto data_not_available;
+		/* Data not available */
+		ret = 0;
+		goto end;
 	}
 	/* The stream is now locked so we can do our ustctl calls */
 
@@ -554,14 +556,14 @@ int lttng_ustconsumer_data_available(struct lttng_consumer_stream *stream)
 		/* There is still data so let's put back this subbuffer. */
 		ret = ustctl_put_subbuf(stream->chan->handle, stream->buf);
 		assert(ret == 0);
-		pthread_mutex_unlock(&stream->lock);
-		goto data_not_available;
+		goto end_unlock;
 	}
 
 	/* Data is available to be read for this stream. */
-	pthread_mutex_unlock(&stream->lock);
-	return 1;
+	ret = 1;
 
-data_not_available:
-	return 0;
+end_unlock:
+	pthread_mutex_unlock(&stream->lock);
+end:
+	return ret;
 }