[orchagent]: Remove the global variable gPortsOrch in orch.cpp file (s…

…onic-net#366) This change is the first step of refactoring Orch class. The global variable gPortsOrch is removed from that orch.cpp file and this class no longer requires such external variable. The current solution is to move the global variable into each different places that need this variable. Later, a better design could be introduced to further remove all the global variables from the whole project. Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
madhanmellanox · Nov 2, 2017 · 136621b · 136621b
1 parent 7d39a8b
commit 136621b
Show file tree

Hide file tree

Showing 15 changed files with 102 additions and 37 deletions.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -605,7 +605,7 @@ sai_object_id_t AclRuleL3::getRedirectObjectId(const string& redirect_value)
 
     // Try to parse physical port and LAG first
     Port port;
-    if(m_pAclOrch->m_portOrch->getPort(target, port))
+    if (gPortsOrch->getPort(target, port))
     {
         if (port.m_type == Port::PHY)
         {
@@ -1211,7 +1211,6 @@ bool AclRange::remove()
 
 AclOrch::AclOrch(DBConnector *db, vector<string> tableNames, PortsOrch *portOrch, MirrorOrch *mirrorOrch, NeighOrch *neighOrch, RouteOrch *routeOrch) :
         Orch(db, tableNames),
-        m_portOrch(portOrch),
         m_mirrorOrch(mirrorOrch),
         m_neighOrch(neighOrch),
         m_routeOrch(routeOrch)
@@ -1275,9 +1274,8 @@ void AclOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!m_portOrch->isInitDone())
+    if (!gPortsOrch->isInitDone())
     {
-        /* Wait for ports initialization */
         return;
     }
 
@@ -1586,7 +1584,7 @@ bool AclOrch::processPorts(string portsList, std::function<void (sai_object_id_t
     for (const auto& alias : strList)
     {
         Port port;
-        if (!m_portOrch->getPort(alias, port))
+        if (!gPortsOrch->getPort(alias, port))
         {
             SWSS_LOG_ERROR("Failed to process port. Port %s doesn't exist", alias.c_str());
             return false;

diff --git a/orchagent/aclorch.h b/orchagent/aclorch.h
@@ -280,7 +280,6 @@ class AclOrch : public Orch, public Observer
     }
 
     // FIXME: Add getters for them? I'd better to add a common directory of orch objects and use it everywhere
-    PortsOrch *m_portOrch;
     MirrorOrch *m_mirrorOrch;
     NeighOrch *m_neighOrch;
     RouteOrch *m_routeOrch;

diff --git a/orchagent/bufferorch.cpp b/orchagent/bufferorch.cpp
@@ -538,6 +538,12 @@ task_process_status BufferOrch::processEgressBufferProfileList(Consumer &consume
 void BufferOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
+
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
@@ -1,6 +1,7 @@
 #include "sai.h"
-#include "tokenize.h"
 #include "copporch.h"
+#include "portsorch.h"
+#include "tokenize.h"
 #include "logger.h"
 
 #include <sstream>
@@ -12,7 +13,9 @@ using namespace std;
 extern sai_hostif_api_t*    sai_hostif_api;
 extern sai_policer_api_t*   sai_policer_api;
 extern sai_switch_api_t*    sai_switch_api;
+
 extern sai_object_id_t      gSwitchId;
+extern PortsOrch*           gPortsOrch;
 
 map<string, sai_meter_type_t> policer_meter_map = {
     {"packets", SAI_METER_TYPE_PACKETS},
@@ -585,6 +588,11 @@ void CoppOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/fdborch.cpp b/orchagent/fdborch.cpp
@@ -6,9 +6,10 @@
 #include "tokenize.h"
 #include "fdborch.h"
 
-extern sai_object_id_t gSwitchId;
+extern sai_fdb_api_t    *sai_fdb_api;
 
-extern sai_fdb_api_t *sai_fdb_api;
+extern sai_object_id_t  gSwitchId;
+extern PortsOrch*       gPortsOrch;
 
 void FdbOrch::update(sai_fdb_event_t type, const sai_fdb_entry_t* entry, sai_object_id_t bridge_port_id)
 {
@@ -80,6 +81,11 @@ void FdbOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/intfsorch.cpp b/orchagent/intfsorch.cpp
@@ -54,6 +54,11 @@ void IntfsOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
@@ -27,7 +27,9 @@
 #define MIRROR_SESSION_DSCP_MAX         63
 
 extern sai_mirror_api_t *sai_mirror_api;
-extern sai_object_id_t gSwitchId;
+
+extern sai_object_id_t  gSwitchId;
+extern PortsOrch*       gPortsOrch;
 
 using namespace std::rel_ops;
 
@@ -865,6 +867,11 @@ void MirrorOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
@@ -130,6 +130,11 @@ void NeighOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/orch.cpp b/orchagent/orch.cpp
@@ -233,9 +233,6 @@ ref_resolve_status Orch::resolveFieldRefValue(
 
 void Orch::doTask()
 {
-    if (!gPortsOrch->isInitDone())
-        return;
-
     for(auto &it : m_consumerMap)
     {
         if (!it.second.m_toSync.empty())

diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
@@ -18,6 +18,7 @@
 
 extern sai_port_api_t *sai_port_api;
 extern sai_queue_api_t *sai_queue_api;
+
 extern PortsOrch *gPortsOrch;
 
 template <typename DropHandler, typename ForwardHandler>
@@ -40,6 +41,11 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
@@ -954,8 +954,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
 
 void PortsOrch::doVlanTask(Consumer &consumer)
 {
-    if (!isInitDone())
-        return;
+    SWSS_LOG_ENTER();
 
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
@@ -1017,8 +1016,7 @@ void PortsOrch::doVlanTask(Consumer &consumer)
 
 void PortsOrch::doVlanMemberTask(Consumer &consumer)
 {
-    if (!isInitDone())
-        return;
+    SWSS_LOG_ENTER();
 
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
@@ -1135,8 +1133,7 @@ void PortsOrch::doVlanMemberTask(Consumer &consumer)
 
 void PortsOrch::doLagTask(Consumer &consumer)
 {
-    if (!isInitDone())
-        return;
+    SWSS_LOG_ENTER();
 
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
@@ -1185,8 +1182,7 @@ void PortsOrch::doLagTask(Consumer &consumer)
 
 void PortsOrch::doLagMemberTask(Consumer &consumer)
 {
-    if (!isInitDone())
-        return;
+    SWSS_LOG_ENTER();
 
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
@@ -1301,15 +1297,34 @@ void PortsOrch::doTask(Consumer &consumer)
     string table_name = consumer.m_consumer->getTableName();
 
     if (table_name == APP_PORT_TABLE_NAME)
+    {
         doPortTask(consumer);
-    else if (table_name == APP_VLAN_TABLE_NAME)
-        doVlanTask(consumer);
-    else if (table_name == APP_VLAN_MEMBER_TABLE_NAME)
-        doVlanMemberTask(consumer);
-    else if (table_name == APP_LAG_TABLE_NAME)
-        doLagTask(consumer);
-    else if (table_name == APP_LAG_MEMBER_TABLE_NAME)
-        doLagMemberTask(consumer);
+    }
+    else
+    {
+        /* Wait for all ports to be initialized */
+        if (!isInitDone())
+        {
+            return;
+        }
+
+        if (table_name == APP_VLAN_TABLE_NAME)
+        {
+            doVlanTask(consumer);
+        }
+        else if (table_name == APP_VLAN_MEMBER_TABLE_NAME)
+        {
+            doVlanMemberTask(consumer);
+        }
+        else if (table_name == APP_LAG_TABLE_NAME)
+        {
+            doLagTask(consumer);
+        }
+        else if (table_name == APP_LAG_MEMBER_TABLE_NAME)
+        {
+            doLagMemberTask(consumer);
+        }
+    }
 }
 
 void PortsOrch::initializeQueues(Port &port)

diff --git a/orchagent/qosorch.cpp b/orchagent/qosorch.cpp
@@ -1275,6 +1275,12 @@ task_process_status QosOrch::handlePortQosMapTable(Consumer& consumer)
 void QosOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
+
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -164,6 +164,11 @@ void RouteOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {

diff --git a/orchagent/switchorch.cpp b/orchagent/switchorch.cpp
@@ -38,7 +38,6 @@ void SwitchOrch::doTask(Consumer &consumer)
     while (it != consumer.m_toSync.end())
     {
         auto t = it->second;
-
         auto op = kfvOp(t);
 
         if (op == SET_COMMAND)

diff --git a/orchagent/tunneldecaporch.cpp b/orchagent/tunneldecaporch.cpp
@@ -1,28 +1,31 @@
 #include <string.h>
 #include "tunneldecaporch.h"
+#include "portsorch.h"
 #include "logger.h"
 #include "swssnet.h"
 
 extern sai_tunnel_api_t* sai_tunnel_api;
 extern sai_router_interface_api_t* sai_router_intfs_api;
 
-extern sai_object_id_t gVirtualRouterId;
-extern sai_object_id_t gUnderlayIfId;
-extern sai_object_id_t gSwitchId;
+extern sai_object_id_t  gVirtualRouterId;
+extern sai_object_id_t  gUnderlayIfId;
+extern sai_object_id_t  gSwitchId;
+extern PortsOrch*       gPortsOrch;
 
 TunnelDecapOrch::TunnelDecapOrch(DBConnector *db, string tableName) : Orch(db, tableName)
 {
     SWSS_LOG_ENTER();
 }
 
-/**
- * Function Description:
- *    @brief reads from APP_DB and creates tunnel
- */
 void TunnelDecapOrch::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!gPortsOrch->isInitDone())
+    {
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {