Repository: trafficserver Updated Branches: refs/heads/master 993339627 -> 05ba3e71e
TS-3969 Fixes Debug() output to use the right event check I also added some curly brackets to make the code less error prone, and easier to read. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/05ba3e71 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/05ba3e71 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/05ba3e71 Branch: refs/heads/master Commit: 05ba3e71e9efedd85277841666c46da18fb920ee Parents: 9933396 Author: Oknet Xu <[email protected]> Authored: Mon Oct 26 14:31:50 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Oct 26 14:34:07 2015 -0600 ---------------------------------------------------------------------- iocore/net/UnixNet.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/05ba3e71/iocore/net/UnixNet.cc ---------------------------------------------------------------------- diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc index 7bdbd6e..b3a7587 100644 --- a/iocore/net/UnixNet.cc +++ b/iocore/net/UnixNet.cc @@ -471,9 +471,9 @@ NetHandler::mainNetEvent(int event, Event *e) vc = epd->data.vc; if (get_ev_events(pd, x) & (EVENTIO_READ | EVENTIO_ERROR)) { vc->read.triggered = 1; - if (!read_ready_list.in(vc)) + if (!read_ready_list.in(vc)) { read_ready_list.enqueue(vc); - else if (get_ev_events(pd, x) & EVENTIO_ERROR) { + } else if (get_ev_events(pd, x) & EVENTIO_ERROR) { // check for unhandled epoll events that should be handled Debug("iocore_net_main", "Unhandled epoll event on read: 0x%04x read.enabled=%d closed=%d read.netready_queue=%d", get_ev_events(pd, x), vc->read.enabled, vc->closed, read_ready_list.in(vc)); @@ -482,14 +482,14 @@ NetHandler::mainNetEvent(int event, Event *e) vc = epd->data.vc; if (get_ev_events(pd, x) & (EVENTIO_WRITE | EVENTIO_ERROR)) { vc->write.triggered = 1; - if (!write_ready_list.in(vc)) + if (!write_ready_list.in(vc)) { write_ready_list.enqueue(vc); - else if (get_ev_events(pd, x) & EVENTIO_ERROR) { + } else if (get_ev_events(pd, x) & EVENTIO_ERROR) { // check for unhandled epoll events that should be handled Debug("iocore_net_main", "Unhandled epoll event on write: 0x%04x write.enabled=%d closed=%d write.netready_queue=%d", get_ev_events(pd, x), vc->write.enabled, vc->closed, write_ready_list.in(vc)); } - } else if (!(get_ev_events(pd, x) & EVENTIO_ERROR)) { + } else if (!(get_ev_events(pd, x) & EVENTIO_READ)) { Debug("iocore_net_main", "Unhandled epoll event: 0x%04x", get_ev_events(pd, x)); } } else if (epd->type == EVENTIO_DNS_CONNECTION) {
