Fix: Remove LPOLLNVAL from consumer metadata revents
authorDavid Goulet <dgoulet@efficios.com>
Tue, 18 Sep 2012 15:13:33 +0000 (11:13 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Tue, 18 Sep 2012 15:13:33 +0000 (11:13 -0400)
Without epoll(7), this value does not exist in the compat layer. For
now, this poll error is set within the LPOLLHUP in the poll(2) compat
header and POLLNVAL of epoll is set to POLLHUP so we basically don't
need it at all if we simply use the LPOLLHUP code.

Signed-off-by: David Goulet <dgoulet@efficios.com>
src/common/consumer.c

index 16a6c47f4269e4ad9155ba5d242a5e99ed0c8805..72c820d90a11ec11d61e2e9024cb8f44f1ad009e 100644 (file)
@@ -1696,7 +1696,7 @@ restart:
 
                        /* Check the metadata pipe for incoming metadata. */
                        if (pollfd == ctx->consumer_metadata_pipe[0]) {
-                               if (revents & (LPOLLERR | LPOLLHUP | LPOLLNVAL)) {
+                               if (revents & (LPOLLERR | LPOLLHUP )) {
                                        DBG("Metadata thread pipe hung up");
                                        /*
                                         * Remove the pipe from the poll set and continue the loop
@@ -1776,7 +1776,7 @@ restart:
                         * Remove the stream from the hash table since there is no data
                         * left on the fd because we previously did a read on the buffer.
                         */
-                       if (revents & (LPOLLERR | LPOLLHUP | LPOLLNVAL)) {
+                       if (revents & (LPOLLERR | LPOLLHUP)) {
                                DBG("Metadata fd %d is hup|err|nval.", pollfd);
                                if (!stream->hangup_flush_done
                                                && (consumer_data.type == LTTNG_CONSUMER32_UST
This page took 0.036174 seconds and 4 git commands to generate.