projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fix: missing stdio.h include in signal-helper.hpp
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.cpp
diff --git
a/src/common/consumer/consumer.cpp
b/src/common/consumer/consumer.cpp
index c1abb58df616f036e3f76a9a13959c74d217883b..f97c119705451c1f2080e99327de6488e9283062 100644
(file)
--- a/
src/common/consumer/consumer.cpp
+++ b/
src/common/consumer/consumer.cpp
@@
-2428,9
+2428,8
@@
restart:
stream->wait_fd);
/* Add metadata stream to the global poll events list */
stream->wait_fd);
/* Add metadata stream to the global poll events list */
- lttng_poll_add(&events, stream->wait_fd,
- LPOLLIN | LPOLLPRI | LPOLLHUP);
- } else if (revents & (LPOLLERR | LPOLLHUP)) {
+ lttng_poll_add(&events, stream->wait_fd, LPOLLIN | LPOLLPRI);
+ }else if (revents & (LPOLLERR | LPOLLHUP)) {
DBG("Metadata thread pipe hung up");
/*
* Remove the pipe from the poll set and continue the loop
DBG("Metadata thread pipe hung up");
/*
* Remove the pipe from the poll set and continue the loop
@@
-3020,8
+3019,8
@@
restart:
&chan->wait_fd_node);
rcu_read_unlock();
/* Add channel to the global poll events list */
&chan->wait_fd_node);
rcu_read_unlock();
/* Add channel to the global poll events list */
- lttng_poll_add(&events, chan->wait_fd,
-
LPOLLERR | LPOLLHUP
);
+ // FIXME: Empty flag on a pipe pollset, this might hang on FreeBSD.
+
lttng_poll_add(&events, chan->wait_fd, 0
);
break;
case CONSUMER_CHANNEL_DEL:
{
break;
case CONSUMER_CHANNEL_DEL:
{
This page took
0.026734 seconds
and
4
git commands to generate.