Skip to content

Don't sleep if ProtectedQueue.localQueue is not empty. (#6234) #6234

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
oknet merged 1 commit into from
Nov 30, 2019
Merged

Don't sleep if ProtectedQueue.localQueue is not empty. (#6234) #6234

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
2 changes: 1 addition & 1 deletion iocore/eventsystem/P_UnixEThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "I_EThread.h"
#include "I_EventProcessor.h"

const int DELAY_FOR_RETRY = HRTIME_MSECONDS(10);
const ink_hrtime DELAY_FOR_RETRY = HRTIME_MSECONDS(10);

TS_INLINE Event *
EThread::schedule_imm(Continuation *cont, int callback_event, void *cookie)
Expand Down
8 changes: 7 additions & 1 deletion iocore/eventsystem/UnixEThread.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,13 @@ EThread::execute_regular()
next_time = EventQueue.earliest_timeout();
ink_hrtime sleep_time = next_time - Thread::get_hrtime_updated();
if (sleep_time > 0) {
sleep_time = std::min(sleep_time, HRTIME_MSECONDS(thread_max_heartbeat_mseconds));
if (EventQueueExternal.localQueue.empty()) {
sleep_time = std::min(sleep_time, HRTIME_MSECONDS(thread_max_heartbeat_mseconds));
} else {
// Because of a missed lock, Timed-Event and Negative-Event have been pushed into localQueue for retry in awhile.
// Therefore, we have to set the limitation of sleep time in order to handle the next retry in time.
sleep_time = std::min(sleep_time, DELAY_FOR_RETRY);
}
++(current_metric->_wait);
} else {
sleep_time = 0;
Expand Down