projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use lttng pipe to send new stream to thread
[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 3731cbb26b527c4deb1621de5bf3f84051007a20..e0280f1489e2e8defa25e1311023f4f518e4d666 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-185,21
+185,21
@@
error:
static int send_stream_to_thread(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx)
{
static int send_stream_to_thread(struct lttng_consumer_stream *stream,
struct lttng_consumer_local_data *ctx)
{
- int ret, stream_pipe;
+ int ret;
+ struct lttng_pipe *stream_pipe;
/* Get the right pipe where the stream will be sent. */
if (stream->metadata_flag) {
/* Get the right pipe where the stream will be sent. */
if (stream->metadata_flag) {
- stream_pipe =
lttng_pipe_get_writefd(ctx->consumer_metadata_pipe)
;
+ stream_pipe =
ctx->consumer_metadata_pipe
;
} else {
} else {
- stream_pipe =
lttng_pipe_get_writefd(ctx->consumer_data_pipe)
;
+ stream_pipe =
ctx->consumer_data_pipe
;
}
}
- do {
- ret = write(stream_pipe, &stream, sizeof(stream));
- } while (ret < 0 && errno == EINTR);
+ ret = lttng_pipe_write(stream_pipe, &stream, sizeof(stream));
if (ret < 0) {
if (ret < 0) {
- PERROR("Consumer write %s stream to pipe %d",
- stream->metadata_flag ? "metadata" : "data", stream_pipe);
+ ERR("Consumer write %s stream to pipe %d",
+ stream->metadata_flag ? "metadata" : "data",
+ lttng_pipe_get_writefd(stream_pipe));
}
return ret;
}
return ret;
This page took
0.024384 seconds
and
5
git commands to generate.