Skip to content

Revert "Assert if operations on keep_alive_queue and active_queue are… #5170

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
zwoop merged 1 commit into from
Mar 14, 2019
Merged

Revert "Assert if operations on keep_alive_queue and active_queue are… #5170

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
6 changes: 0 additions & 6 deletions iocore/net/UnixNet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,6 @@ void
NetHandler::add_to_keep_alive_queue(UnixNetVConnection *vc)
{
Debug("net_queue", "NetVC: %p", vc);
ink_assert(mutex->thread_holding == this_ethread());

if (keep_alive_queue.in(vc)) {
// already in the keep-alive queue, move the head
Expand All @@ -709,8 +708,6 @@ void
NetHandler::remove_from_keep_alive_queue(UnixNetVConnection *vc)
{
Debug("net_queue", "NetVC: %p", vc);
ink_assert(mutex->thread_holding == this_ethread());

if (keep_alive_queue.in(vc)) {
keep_alive_queue.remove(vc);
--keep_alive_queue_size;
Expand All @@ -723,7 +720,6 @@ NetHandler::add_to_active_queue(UnixNetVConnection *vc)
Debug("net_queue", "NetVC: %p", vc);
Debug("net_queue", "max_connections_per_thread_in: %d active_queue_size: %d keep_alive_queue_size: %d",
max_connections_per_thread_in, active_queue_size, keep_alive_queue_size);
ink_assert(mutex->thread_holding == this_ethread());

// if active queue is over size then close inactive connections
if (manage_active_queue() == false) {
Expand All @@ -748,8 +744,6 @@ void
NetHandler::remove_from_active_queue(UnixNetVConnection *vc)
{
Debug("net_queue", "NetVC: %p", vc);
ink_assert(mutex->thread_holding == this_ethread());

if (active_queue.in(vc)) {
active_queue.remove(vc);
--active_queue_size;
Expand Down
31 changes: 4 additions & 27 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,48 +1543,25 @@ UnixNetVConnection::migrateToCurrentThread(Continuation *cont, EThread *t)
void
UnixNetVConnection::add_to_keep_alive_queue()
{
MUTEX_TRY_LOCK(lock, nh->mutex, this_ethread());
if (lock.is_locked()) {
nh->add_to_keep_alive_queue(this);
} else {
ink_release_assert(!"BUG: It must have acquired the NetHandler's lock before doing anything on keep_alive_queue.");
}
nh->add_to_keep_alive_queue(this);
}

void
UnixNetVConnection::remove_from_keep_alive_queue()
{
MUTEX_TRY_LOCK(lock, nh->mutex, this_ethread());
if (lock.is_locked()) {
nh->remove_from_keep_alive_queue(this);
} else {
ink_release_assert(!"BUG: It must have acquired the NetHandler's lock before doing anything on keep_alive_queue.");
}
nh->remove_from_keep_alive_queue(this);
}

bool
UnixNetVConnection::add_to_active_queue()
{
bool result = false;

MUTEX_TRY_LOCK(lock, nh->mutex, this_ethread());
if (lock.is_locked()) {
result = nh->add_to_active_queue(this);
} else {
ink_release_assert(!"BUG: It must have acquired the NetHandler's lock before doing anything on active_queue.");
}
return result;
return nh->add_to_active_queue(this);
}

void
UnixNetVConnection::remove_from_active_queue()
{
MUTEX_TRY_LOCK(lock, nh->mutex, this_ethread());
if (lock.is_locked()) {
nh->remove_from_active_queue(this);
} else {
ink_release_assert(!"BUG: It must have acquired the NetHandler's lock before doing anything on active_queue.");
}
nh->remove_from_active_queue(this);
}

int
Expand Down