Skip to content
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

Temporarily disable Acl thread to collect counters #202

Merged
merged 1 commit into from
May 1, 2017
Merged

Temporarily disable Acl thread to collect counters #202

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: 0 additions & 2 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,6 @@ bool AclRange::remove()

AclOrch::AclOrch(DBConnector *db, vector<string> tableNames, PortsOrch *portOrch, MirrorOrch *mirrorOrch) :
Orch(db, tableNames),
thread(AclOrch::collectCountersThread, this),
m_portOrch(portOrch),
m_mirrorOrch(mirrorOrch)
{
Expand Down Expand Up @@ -826,7 +825,6 @@ AclOrch::~AclOrch()

m_bCollectCounters = false;
m_sleepGuard.notify_all();
join();
}

void AclOrch::update(SubjectType type, void *cntx)
Expand Down
3 changes: 1 addition & 2 deletions orchagent/aclorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include <iostream>
#include <sstream>
#include <thread>
#include <mutex>
#include <tuple>
#include <condition_variable>
Expand Down Expand Up @@ -228,7 +227,7 @@ inline void split(string str, Iterable& out, char delim = ' ')
}
}

class AclOrch : public Orch, public Observer, public thread
class AclOrch : public Orch, public Observer
{
public:
AclOrch(DBConnector *db, vector<string> tableNames, PortsOrch *portOrch, MirrorOrch *mirrorOrch);
Expand Down