[portsorch]: Rename function isPortReady() to allPortsReady() (#990)

wendani · stcheng · commit 5d04f0590443 · 2019-07-23T22:44:43.000-07:00
Signed-off-by: Wenda Ni &lt;wenni@microsoft.com&gt;
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -2128,7 +2128,7 @@ void AclOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
@@ -589,7 +589,7 @@ void CoppOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/fdborch.cpp b/orchagent/fdborch.cpp
@@ -262,7 +262,7 @@ void FdbOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
@@ -342,7 +342,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp
@@ -45,7 +45,7 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/intfsorch.cpp b/orchagent/intfsorch.cpp
@@ -252,7 +252,7 @@ void IntfsOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
@@ -968,7 +968,7 @@ void MirrorOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
@@ -275,7 +275,7 @@ void NeighOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -179,7 +179,7 @@ bool OrchDaemon::init()
 
     /*
      * The order of the orch list is important for state restore of warm start and
-     * the queued processing in m_toSync map after gPortsOrch->isPortReady() is set.
+     * the queued processing in m_toSync map after gPortsOrch->allPortsReady() is set.
      *
      * For the multiple consumers in ports_tables, tasks for LAG_TABLE is processed before VLAN_TABLE
      * when iterating ConsumerMap.
diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
@@ -53,7 +53,7 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/policerorch.cpp b/orchagent/policerorch.cpp
@@ -114,7 +114,7 @@ void PolicerOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
@@ -388,7 +388,7 @@ void PortsOrch::removeDefaultBridgePorts()
     SWSS_LOG_NOTICE("Remove bridge ports from default 1Q bridge");
 }
 
-bool PortsOrch::isPortReady()
+bool PortsOrch::allPortsReady()
 {
     return m_initDone && m_pendingPortSet.empty();
 }
@@ -2371,7 +2371,7 @@ void PortsOrch::doTask(Consumer &consumer)
     else
     {
         /* Wait for all ports to be initialized */
-        if (!isPortReady())
+        if (!allPortsReady())
         {
             return;
         }
@@ -3222,7 +3222,7 @@ void PortsOrch::doTask(NotificationConsumer &consumer)
     SWSS_LOG_ENTER();
 
     /* Wait for all ports to be initialized */
-    if (!isPortReady())
+    if (!allPortsReady())
     {
         return;
     }
diff --git a/orchagent/portsorch.h b/orchagent/portsorch.h
@@ -55,7 +55,7 @@ class PortsOrch : public Orch, public Subject
 public:
     PortsOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames);
 
-    bool isPortReady();
+    bool allPortsReady();
     bool isInitDone();
 
     map<string, Port>& getAllPorts();
diff --git a/orchagent/qosorch.cpp b/orchagent/qosorch.cpp
@@ -1386,7 +1386,7 @@ void QosOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -286,7 +286,7 @@ void RouteOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/tunneldecaporch.cpp b/orchagent/tunneldecaporch.cpp
@@ -21,7 +21,7 @@ void TunnelDecapOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
diff --git a/orchagent/watermarkorch.cpp b/orchagent/watermarkorch.cpp
@@ -50,7 +50,7 @@ void WatermarkOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }
@@ -141,7 +141,7 @@ void WatermarkOrch::handleFcConfigUpdate(const std::string &key, const std::vect
 void WatermarkOrch::doTask(NotificationConsumer &consumer)
 {
     SWSS_LOG_ENTER();
-    if (!gPortsOrch->isPortReady())
+    if (!gPortsOrch->allPortsReady())
     {
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -2128,7 +2128,7 @@ void AclOrch::doTask(Consumer &consumer)`
`2128`	`2128`	`{`
`2129`	`2129`	`SWSS_LOG_ENTER();`
`2130`	`2130`
`2131`		`- if (!gPortsOrch->isPortReady())`
	`2131`	`+ if (!gPortsOrch->allPortsReady())`
`2132`	`2132`	`{`
`2133`	`2133`	`return;`
`2134`	`2134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ void CoppOrch::doTask(Consumer &consumer)`
`589`	`589`	`{`
`590`	`590`	`SWSS_LOG_ENTER();`
`591`	`591`
`592`		`- if (!gPortsOrch->isPortReady())`
	`592`	`+ if (!gPortsOrch->allPortsReady())`
`593`	`593`	`{`
`594`	`594`	`return;`
`595`	`595`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ void FdbOrch::doTask(Consumer& consumer)`
`262`	`262`	`{`
`263`	`263`	`SWSS_LOG_ENTER();`
`264`	`264`
`265`		`- if (!gPortsOrch->isPortReady())`
	`265`	`+ if (!gPortsOrch->allPortsReady())`
`266`	`266`	`{`
`267`	`267`	`return;`
`268`	`268`	`}`
`@@ -342,7 +342,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)`
`342`	`342`	`{`
`343`	`343`	`SWSS_LOG_ENTER();`
`344`	`344`
`345`		`- if (!gPortsOrch->isPortReady())`
	`345`	`+ if (!gPortsOrch->allPortsReady())`
`346`	`346`	`{`
`347`	`347`	`return;`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void FlexCounterOrch::doTask(Consumer &consumer)`
`45`	`45`	`{`
`46`	`46`	`SWSS_LOG_ENTER();`
`47`	`47`
`48`		`- if (!gPortsOrch->isPortReady())`
	`48`	`+ if (!gPortsOrch->allPortsReady())`
`49`	`49`	`{`
`50`	`50`	`return;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void IntfsOrch::doTask(Consumer &consumer)`
`252`	`252`	`{`
`253`	`253`	`SWSS_LOG_ENTER();`
`254`	`254`
`255`		`- if (!gPortsOrch->isPortReady())`
	`255`	`+ if (!gPortsOrch->allPortsReady())`
`256`	`256`	`{`
`257`	`257`	`return;`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -968,7 +968,7 @@ void MirrorOrch::doTask(Consumer& consumer)`
`968`	`968`	`{`
`969`	`969`	`SWSS_LOG_ENTER();`
`970`	`970`
`971`		`- if (!gPortsOrch->isPortReady())`
	`971`	`+ if (!gPortsOrch->allPortsReady())`
`972`	`972`	`{`
`973`	`973`	`return;`
`974`	`974`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void NeighOrch::doTask(Consumer &consumer)`
`275`	`275`	`{`
`276`	`276`	`SWSS_LOG_ENTER();`
`277`	`277`
`278`		`- if (!gPortsOrch->isPortReady())`
	`278`	`+ if (!gPortsOrch->allPortsReady())`
`279`	`279`	`{`
`280`	`280`	`return;`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ bool OrchDaemon::init()`
`179`	`179`
`180`	`180`	`/*`
`181`	`181`	`* The order of the orch list is important for state restore of warm start and`
`182`		`- * the queued processing in m_toSync map after gPortsOrch->isPortReady() is set.`
	`182`	`+ * the queued processing in m_toSync map after gPortsOrch->allPortsReady() is set.`
`183`	`183`	`*`
`184`	`184`	`* For the multiple consumers in ports_tables, tasks for LAG_TABLE is processed before VLAN_TABLE`
`185`	`185`	`* when iterating ConsumerMap.`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)`
`53`	`53`	`{`
`54`	`54`	`SWSS_LOG_ENTER();`
`55`	`55`
`56`		`- if (!gPortsOrch->isPortReady())`
	`56`	`+ if (!gPortsOrch->allPortsReady())`
`57`	`57`	`{`
`58`	`58`	`return;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void PolicerOrch::doTask(Consumer &consumer)`
`114`	`114`	`{`
`115`	`115`	`SWSS_LOG_ENTER();`
`116`	`116`
`117`		`- if (!gPortsOrch->isPortReady())`
	`117`	`+ if (!gPortsOrch->allPortsReady())`
`118`	`118`	`{`
`119`	`119`	`return;`
`120`	`120`	`}`