minor updates; merged with master via shared

Author: renukamanavalan

common/Makefile.am

@@ -73,7 +73,7 @@ libswsscommon_la_SOURCES = \
 
 libswsscommon_la_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 libswsscommon_la_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
-libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid -lboost_serialization
+libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid
 
 swssloglevel_SOURCES = loglevel.cpp
 

common/events.cpp

@@ -177,7 +177,7 @@ event_publish(event_handle_t handle, const string tag, const event_params_t *par
 }
 
 
-EventSubscriber::EventSubscriber() : m_zmq_ctx(NULL), m_socket(NULL)
+EventSubscriber::EventSubscriber() : m_zmq_ctx(NULL), m_socket(NULL),
     m_cache_read(false)
 {};
 
@@ -221,8 +221,10 @@ EventSubscriber::~EventSubscriber()
                     break;
                 }
             }
-            serialize(evt_data, evt_str);
-            events.push_back(evt_str);
+            else {
+                serialize(evt_data, evt_str);
+                events.push_back(evt_str);
+            }
             chrono::steady_clock::time_point now = chrono::steady_clock::now();
             if (chrono::duration_cast<std::chrono::milliseconds>(now - start).count() >
                     CACHE_DRAIN_IN_MILLISECS)

common/events_common.cpp

@@ -8,7 +8,7 @@ int running_ut = 0;
  * defaults for all config entries
  */
 #define CFG_VAL map_str_str_t::value_type
-map_str_str_t cfg_data = {
+const map_str_str_t cfg_default = {
     CFG_VAL(XSUB_END_KEY, "tcp://127.0.0.1:5570"),
     CFG_VAL(XPUB_END_KEY, "tcp://127.0.0.1:5571"),
     CFG_VAL(REQ_REP_END_KEY, "tcp://127.0.0.1:5572"),
@@ -17,12 +17,21 @@ map_str_str_t cfg_data = {
     CFG_VAL(CACHE_MAX_CNT, "")
 };
 
+map_str_str_t cfg_data;
+
 void
 read_init_config(const char *init_cfg_file)
 {
+    /* Set default and override from file */
+    cfg_data = cfg_default;
+
+    if (init_cfg_file == NULL) {
+        return;
+    }
+
     ifstream fs (init_cfg_file);
 
-    if (!fs.is_open())
+    if (!fs.is_open()) 
         return;
 
     stringstream buffer;
@@ -49,11 +58,8 @@ read_init_config(const char *init_cfg_file)
 string
 get_config(const string key)
 {
-    static bool init = false;
-
-    if (!init) {
+    if (cfg_data.empty()) {
         read_init_config(INIT_CFG_PATH);
-        init = true;
     }   
     /* Intentionally crash for non-existing key, as this
      * is internal code bug

tests/Makefile.am

@@ -36,12 +36,11 @@ tests_SOURCES = redis_ut.cpp                \
                 status_code_util_test.cpp   \
                 saiaclschema_ut.cpp         \
                 timer_ut.cpp                \
-                cli_ut.cpp                  \
                 events_common_ut.cpp        \
                 events_service_ut.cpp       \
                 events_ut.cpp               \
                 main.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(LIBNL_CFLAGS)
 tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(LIBNL_CFLAGS)
-tests_LDADD = $(LDADD_GTEST) -lpthread -L$(top_srcdir)/common -lswsscommon $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -L$(top_srcdir)/sonic-db-cli -lsonicdbcli -lzmq -luuid -lboost_serialization
+tests_LDADD = $(LDADD_GTEST) -lpthread -L$(top_srcdir)/common -lswsscommon $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -luuid -lboost_serialization

tests/events_common_ut.cpp

@@ -37,7 +37,8 @@ TEST(events_common, get_config)
 
     EXPECT_EQ(100, get_config_data(CACHE_MAX_CNT, 100));
 
-    cout << "events_common: get_config succeeded\n";
+    read_init_config(NULL);
+    EXPECT_EQ(string("tcp://127.0.0.1:5570"), get_config(string(XSUB_END_KEY)));
 }
 
 void

tests/events_ut.cpp

@@ -164,7 +164,7 @@ parse_read_evt(string &source, internal_event_t &evt,
 TEST(events, publish)
 {
     // Enables all log messages to be printed, when this flag is set.
-    // running_ut = 1;
+    running_ut = 0;
 
     string evt_source0("sonic-events-bgp");
     string evt_source1("sonic-events-xyz");
@@ -469,7 +469,7 @@ TEST(events, subscribe)
 {
     int i;
     // Enables all log messages to be printed, when this flag is set.
-    // running_ut = 1;
+    running_ut = 0;
 
 
     /*