projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Set a single return point and mutex unlock
[lttng-tools.git]
/
src
/
common
/
kernel-consumer
/
kernel-consumer.c
diff --git
a/src/common/kernel-consumer/kernel-consumer.c
b/src/common/kernel-consumer/kernel-consumer.c
index 4e000fbd167e294c6b9139b6b7bdd2cf0098d6f1..249df8a47bc4789ae9aedee05300e248c52e926e 100644
(file)
--- 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) {
*/
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 */
}
/* 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);
/* 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. */
}
/* 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;
}
}
This page took
0.024192 seconds
and
4
git commands to generate.