Skip to content

EPoll error capture - store in NetEvent for later processing. #7803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SolidWallOfCode wants to merge 1 commit into from
Closed

EPoll error capture - store in NetEvent for later processing. #7803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iocore/net/NetEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class NetEvent
struct {
unsigned int got_local_addr : 1;
unsigned int shutdown : 2;
unsigned int epoll_error : 1;
} f;
};
};
20 changes: 11 additions & 9 deletions iocore/net/UnixNet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,27 +507,29 @@ NetHandler::waitForActivity(ink_hrtime timeout)
if (cop_list.in(ne)) {
cop_list.remove(ne);
}
if (get_ev_events(pd, x) & (EVENTIO_READ | EVENTIO_ERROR)) {
auto flags = get_ev_events(pd, x);
ne->f.epoll_error = (0 != (flags & EVENTIO_ERROR));
if (flags & (EVENTIO_READ | EVENTIO_ERROR)) {
ne->read.triggered = 1;
if (!read_ready_list.in(ne)) {
read_ready_list.enqueue(ne);
} else if (get_ev_events(pd, x) & EVENTIO_ERROR) {
} else if (flags & 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), ne->read.enabled, ne->closed, read_ready_list.in(ne));
Debug("iocore_net_main", "Unhandled epoll event on read: 0x%04x read.enabled=%d closed=%d read.netready_queue=%d", flags,
ne->read.enabled, ne->closed, read_ready_list.in(ne));
}
}
if (get_ev_events(pd, x) & (EVENTIO_WRITE | EVENTIO_ERROR)) {
if (flags & (EVENTIO_WRITE | EVENTIO_ERROR)) {
ne->write.triggered = 1;
if (!write_ready_list.in(ne)) {
write_ready_list.enqueue(ne);
} else if (get_ev_events(pd, x) & EVENTIO_ERROR) {
} else if (flags & 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), ne->write.enabled, ne->closed, write_ready_list.in(ne));
flags, ne->write.enabled, ne->closed, write_ready_list.in(ne));
}
} 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 (!(flags & EVENTIO_READ)) {
Debug("iocore_net_main", "Unhandled epoll event: 0x%04x", flags);
}
} else if (epd->type == EVENTIO_DNS_CONNECTION) {
if (epd->data.dnscon != nullptr) {
Expand Down