fixed linkage problem after moving globals to struct, and also insertion counter is inced only after real insertion

Author: yonatanp

cfgmgr/intfmgrd.cpp

@@ -23,13 +23,7 @@ using namespace swss;
  * Once Orch class refactoring is done, these global variables
  * should be removed from here.
  */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
+global_config_t g;
 
 int main(int argc, char **argv)
 {

cfgmgr/vlanmgr.cpp

@@ -17,7 +17,7 @@ using namespace swss;
 #define MAX_MTU             9100
 #define VLAN_HLEN            4
 
-extern MacAddress gMacAddress;
+extern global_config_t g;
 
 VlanMgr::VlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames) :
         Orch(cfgDb, tableNames),
@@ -73,7 +73,7 @@ bool VlanMgr::addHostVlan(int vlan_id)
     EXEC_WITH_ERROR_THROW(cmd.str(), res);
 
     cmd.str("");
-    cmd << IP_CMD << " link set " << VLAN_PREFIX << vlan_id << " address " << gMacAddress.to_string();
+    cmd << IP_CMD << " link set " << VLAN_PREFIX << vlan_id << " address " << g.macAddress.to_string();
     EXEC_WITH_ERROR_THROW(cmd.str(), res);
 
     // Bring up vlan port by default
@@ -176,7 +176,7 @@ bool VlanMgr::removeHostVlanMember(int vlan_id, const string &port_alias)
 
 bool VlanMgr::isVlanMacOk()
 {
-    return !!gMacAddress;
+    return !!g.macAddress;
 }
 
 void VlanMgr::doVlanTask(Consumer &consumer)

cfgmgr/vlanmgrd.cpp

@@ -20,8 +20,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-MacAddress gMacAddress;
-
 /*
  * Following global variables are defined here for the purpose of
  * using existing Orch class which is to be refactored soon to
@@ -30,13 +28,7 @@ MacAddress gMacAddress;
  * Once Orch class refactoring is done, these global variables
  * should be removed from here.
  */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
+global_config_t g;
 
 int main(int argc, char **argv)
 {
@@ -68,7 +60,7 @@ int main(int argc, char **argv)
         if ( it == ovalues.end() ) {
             throw runtime_error("couldn't find MAC address of the device from config DB");
         }
-        gMacAddress = MacAddress(it->second);
+        g.macAddress = MacAddress(it->second);
 
         VlanMgr vlanmgr(&cfgDb, &appDb, &stateDb, cfg_vlan_tables);
 

orchagent/bmt_cache_inserter.cpp

@@ -526,10 +526,11 @@ int bmt_cache_inserter(void)
                     SWSS_LOG_NOTICE("[inserter] flow insertion, was seen %d times in the window",it_pkt.second.second);
                     if (!g.pauseCacheInsertion) {
                         sai_status_t status = bmt_cache_insert_vhost_entry(it_pkt.first.second, it_pkt.second.first, it_pkt.first.first);
-                        g.cacheInsertCount++;
                         SWSS_LOG_NOTICE("[inserter] [recv]    bmt_cache_insert_vhost_entry. status = %d",status);
                         if (status != SAI_STATUS_SUCCESS)
                             SWSS_LOG_ERROR("[inserter] can't add entry to vhost table");
+			else
+                            g.cacheInsertCount++;
                     }
                 } else {
                     SWSS_LOG_NOTICE("[inserter] skipping flow insertion, was seen %d times in the window",it_pkt.second.second);

orchagent/bmt_debug/bmt_debug

@@ -10,7 +10,6 @@
 #include "tokenize.h"
 #include "logger.h"
 #include "consumerstatetable.h"
-#include "bmt_common.h"
 
 using namespace swss;
 

orchagent/orch.cpp

@@ -15,6 +15,7 @@ extern "C" {
 #include "consumerstatetable.h"
 #include "notificationconsumer.h"
 #include "selectabletimer.h"
+#include "bmt_common.h"
 
 using namespace std;
 using namespace swss;