Skip to content

Do not lose original inactivity timeout on disable #7134

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

Merged
shinrich merged 2 commits into from
Sep 14, 2020
Merged

Do not lose original inactivity timeout on disable #7134

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c454e36
Do not lose original inactivity timeout on disable
shinrich Aug 24, 2020
785805b
Improve comment
shinrich Sep 14, 2020
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
8 changes: 6 additions & 2 deletions iocore/net/P_UnixNet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,9 @@ static inline void
read_disable(NetHandler *nh, NetEvent *ne)
{
if (!ne->write.enabled) {
ne->set_inactivity_timeout(0);
// Clear the next scheduled inactivity time, but don't clear inactivity_timeout_in,
// so the current timeout is used when the NetEvent is reenabled and not the default inactivity timeout
ne->next_inactivity_timeout_at = 0;
Debug("socket", "read_disable updating inactivity_at %" PRId64 ", NetEvent=%p", ne->next_inactivity_timeout_at, ne);
}
ne->read.enabled = 0;
Expand All @@ -569,7 +571,9 @@ static inline void
write_disable(NetHandler *nh, NetEvent *ne)
{
if (!ne->read.enabled) {
ne->set_inactivity_timeout(0);
// Clear the next scheduled inactivity time, but don't clear inactivity_timeout_in,
// so the current timeout is used when the NetEvent is reenabled and not the default inactivity timeout
ne->next_inactivity_timeout_at = 0;
Debug("socket", "write_disable updating inactivity_at %" PRId64 ", NetEvent=%p", ne->next_inactivity_timeout_at, ne);
}
ne->write.enabled = 0;
Expand Down