projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng UST and kernel consumer: fix ret vs errno mixup
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index e81f05041249a164ce09151e9907c0602b41d6be..113682384ae44d829d03af00b1378d25687a4a39 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-58,7
+58,7
@@
int lttng_ustconsumer_on_read_subbuffer_mmap(
ret = ustctl_get_mmap_read_offset(stream->chan->handle,
stream->buf, &mmap_offset);
if (ret != 0) {
ret = ustctl_get_mmap_read_offset(stream->chan->handle,
stream->buf, &mmap_offset);
if (ret != 0) {
-
ret = -errno
;
+
errno = -ret
;
perror("ustctl_get_mmap_read_offset");
goto end;
}
perror("ustctl_get_mmap_read_offset");
goto end;
}
@@
-67,7
+67,7
@@
int lttng_ustconsumer_on_read_subbuffer_mmap(
if (ret >= len) {
len = 0;
} else if (ret < 0) {
if (ret >= len) {
len = 0;
} else if (ret < 0) {
-
ret = -errno
;
+
errno = -ret
;
perror("Error in file write");
goto end;
}
perror("Error in file write");
goto end;
}
@@
-109,7
+109,7
@@
int lttng_ustconsumer_take_snapshot(struct lttng_consumer_local_data *ctx,
ret = ustctl_snapshot(stream->chan->handle, stream->buf);
if (ret != 0) {
ret = ustctl_snapshot(stream->chan->handle, stream->buf);
if (ret != 0) {
-
ret = errno
;
+
errno = -ret
;
perror("Getting sub-buffer snapshot.");
}
perror("Getting sub-buffer snapshot.");
}
@@
-131,7
+131,7
@@
int lttng_ustconsumer_get_produced_snapshot(
ret = ustctl_snapshot_get_produced(stream->chan->handle,
stream->buf, pos);
if (ret != 0) {
ret = ustctl_snapshot_get_produced(stream->chan->handle,
stream->buf, pos);
if (ret != 0) {
-
ret = errno
;
+
errno = -ret
;
perror("kernctl_snapshot_get_produced");
}
perror("kernctl_snapshot_get_produced");
}
@@
-347,7
+347,7
@@
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
if (!stream->hangup_flush_done) {
do {
readlen = read(stream->wait_fd, &dummy, 1);
if (!stream->hangup_flush_done) {
do {
readlen = read(stream->wait_fd, &dummy, 1);
- } while (readlen == -1 && errno ==
-
EINTR);
+ } while (readlen == -1 && errno == EINTR);
if (readlen == -1) {
ret = readlen;
goto end;
if (readlen == -1) {
ret = readlen;
goto end;
This page took
0.024182 seconds
and
4
git commands to generate.