[aclorch]: Temporarily disable ACL thread of collecting counters (sonic-net#202)

qiluo-msft · Shuotian Cheng · commit 2f594c75036d · 2017-05-01T15:59:55.000-07:00
This commit is to mitigate the issue sonic-net#201.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -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)
 {
@@ -826,7 +825,6 @@ AclOrch::~AclOrch()
 
     m_bCollectCounters = false;
     m_sleepGuard.notify_all();
-    join();
 }
 
 void AclOrch::update(SubjectType type, void *cntx)
diff --git a/orchagent/aclorch.h b/orchagent/aclorch.h
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <sstream>
-#include <thread>
 #include <mutex>
 #include <tuple>
 #include <condition_variable>
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,6 @@ bool AclRange::remove()`
`794`	`794`
`795`	`795`	`AclOrch::AclOrch(DBConnector db, vector<string> tableNames, PortsOrch portOrch, MirrorOrch *mirrorOrch) :`
`796`	`796`	`Orch(db, tableNames),`
`797`		`- thread(AclOrch::collectCountersThread, this),`
`798`	`797`	`m_portOrch(portOrch),`
`799`	`798`	`m_mirrorOrch(mirrorOrch)`
`800`	`799`	`{`
`@@ -826,7 +825,6 @@ AclOrch::~AclOrch()`
`826`	`825`
`827`	`826`	`m_bCollectCounters = false;`
`828`	`827`	`m_sleepGuard.notify_all();`
`829`		`- join();`
`830`	`828`	`}`
`831`	`829`
`832`	`830`	`void AclOrch::update(SubjectType type, void *cntx)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`#include <iostream>`
`5`	`5`	`#include <sstream>`
`6`		`-#include <thread>`
`7`	`6`	`#include <mutex>`
`8`	`7`	`#include <tuple>`
`9`	`8`	`#include <condition_variable>`
`@@ -228,7 +227,7 @@ inline void split(string str, Iterable& out, char delim = ' ')`
`228`	`227`	`}`
`229`	`228`	`}`
`230`	`229`
`231`		`-class AclOrch : public Orch, public Observer, public thread`
	`230`	`+class AclOrch : public Orch, public Observer`
`232`	`231`	`{`
`233`	`232`	`public:`
`234`	`233`	`AclOrch(DBConnector db, vector<string> tableNames, PortsOrch portOrch, MirrorOrch *mirrorOrch);`