Fix saisdkdump profile file handling.

.gitignore

@@ -119,6 +119,7 @@ unittest/vslib/testslibsaivs
 unittest/proxylib/tests
 unittest/proxylib/testslibsaiproxy
 unittest/saidump/tests
+unittest/saisdkdump/tests
 vslib/tests
 stub/tests
 unittest/stub/stub/testslibsaistub

configure.ac

@@ -306,6 +306,7 @@ AC_OUTPUT(Makefile
           unittest/syncd/Makefile
           unittest/proxylib/Makefile
           unittest/saidump/Makefile
+          unittest/saisdkdump/Makefile
           pyext/Makefile
           pyext/py2/Makefile
           pyext/py3/Makefile)

saisdkdump/Makefile.am

@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(SAIINC)
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/saisdkdump
 
 bin_PROGRAMS = saisdkdump
 
@@ -8,7 +8,13 @@ else
 SAILIB=-lsai
 endif
 
+noinst_LIBRARIES = libsaisdkdump_profile.a
+
+libsaisdkdump_profile_a_SOURCES = ProfileMap.cpp
+libsaisdkdump_profile_a_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
+libsaisdkdump_profile_a_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
+
 saisdkdump_SOURCES = saisdkdump.cpp
 saisdkdump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saisdkdump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-saisdkdump_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) $(EXTRA_LIBSAI_LDFLAGS)
+saisdkdump_LDADD = libsaisdkdump_profile.a -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -lsaimeta -lzmq $(CODE_COVERAGE_LIBS) $(EXTRA_LIBSAI_LDFLAGS)

saisdkdump/ProfileMap.cpp

@@ -0,0 +1,132 @@
+#include "ProfileMap.h"
+
+#include <cerrno>
+#include <cstring>
+#include <fstream>
+
+#include "swss/logger.h"
+
+ProfileMap::ProfileMap()
+    : m_iter(m_map.begin())
+{
+}
+
+bool ProfileMap::loadFromFile(const std::string& profileMapFile)
+{
+    SWSS_LOG_ENTER();
+
+    m_map.clear();
+    m_iter = m_map.begin();
+
+    if (profileMapFile.empty())
+    {
+        return true;
+    }
+
+    std::ifstream profile(profileMapFile);
+
+    if (!profile.is_open())
+    {
+        SWSS_LOG_ERROR("failed to open profile map file: '%s' : %s",
+                profileMapFile.c_str(), strerror(errno));
+
+        return false;
+    }
+
+    std::string line;
+
+    while (getline(profile, line))
+    {
+        if (!line.empty() && line.back() == '\r')
+        {
+            line.pop_back();
+        }
+
+        if (line.size() > 0 && (line[0] == '#' || line[0] == ';'))
+        {
+            continue;
+        }
+
+        size_t pos = line.find("=");
+
+        if (pos == std::string::npos)
+        {
+            SWSS_LOG_WARN("not found '=' in line %s", line.c_str());
+            continue;
+        }
+
+        std::string key = line.substr(0, pos);
+        std::string value = line.substr(pos + 1);
+
+        m_map[key] = value;
+
+        SWSS_LOG_INFO("inserted: %s:%s", key.c_str(), value.c_str());
+    }
+
+    return true;
+}
+
+void ProfileMap::clear()
+{
+    SWSS_LOG_ENTER();
+
+    m_map.clear();
+    m_iter = m_map.begin();
+}
+
+const char* ProfileMap::getValue(const char* variable) const
+{
+    SWSS_LOG_ENTER();
+
+    if (variable == NULL)
+    {
+        SWSS_LOG_WARN("variable is null");
+        return NULL;
+    }
+
+    auto it = m_map.find(variable);
+
+    if (it == m_map.end())
+    {
+        SWSS_LOG_NOTICE("%s: NULL", variable);
+        return NULL;
+    }
+
+    SWSS_LOG_NOTICE("%s: %s", variable, it->second.c_str());
+
+    return it->second.c_str();
+}
+
+int ProfileMap::getNextValue(const char** variable, const char** value)
+{
+    SWSS_LOG_ENTER();
+
+    if (value == NULL)
+    {
+        SWSS_LOG_INFO("resetting profile map iterator");
+
+        m_iter = m_map.begin();
+        return 0;
+    }
+
+    if (variable == NULL)
+    {
+        SWSS_LOG_WARN("variable is null");
+        return -1;
+    }
+
+    if (m_iter == m_map.end())
+    {
+        SWSS_LOG_INFO("iterator reached end");
+        return -1;
+    }
+
+    *variable = m_iter->first.c_str();
+    *value = m_iter->second.c_str();
+
+    SWSS_LOG_INFO("key: %s:%s", *variable, *value);
+
+    m_iter++;
+
+    return 0;
+}

saisdkdump/ProfileMap.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+class ProfileMap
+{
+public:
+    ProfileMap();
+
+    bool loadFromFile(const std::string& profileMapFile);
+
+    void clear();
+
+    const char* getValue(const char* variable) const;
+
+    int getNextValue(const char** variable, const char** value);
+
+private:
+    std::map<std::string, std::string> m_map;
+    mutable std::map<std::string, std::string>::iterator m_iter;
+};

saisdkdump/saisdkdump.cpp

@@ -1,11 +1,12 @@
 #include <iostream>
 #include <sstream>
 #include <ctime>
-#include <sstream>
 
 #include <unistd.h>
 #include <getopt.h>
+#include <cstring>
 
+#include "ProfileMap.h"
 #include "swss/logger.h"
 
 extern "C" {
@@ -16,6 +17,8 @@ extern "C" {
 
 std::string sai_profile = "/tmp/sai.profile";
 
+static ProfileMap g_profileMap;
+
 void print_usage()
 {
     SWSS_LOG_ENTER();
@@ -46,7 +49,7 @@ const char* profile_get_value(
 {
     SWSS_LOG_ENTER();
 
-    return sai_profile.c_str();
+    return g_profileMap.getValue(variable);
 }
 
 int profile_get_next_value(
@@ -55,7 +58,8 @@ int profile_get_next_value(
         _Out_ const char** value)
 {
     SWSS_LOG_ENTER();
-    return -1;
+
+    return g_profileMap.getNextValue(variable, value);
 }
 
 sai_service_method_table_t test_services = {
@@ -120,6 +124,11 @@ int main(int argc, char **argv)
         SWSS_LOG_INFO("The dump file is not specified, generated \"%s\" file name", fileName.c_str());
     }
 
+    if (!g_profileMap.loadFromFile(sai_profile))
+    {
+        exit(EXIT_FAILURE);
+    }
+
     sai_status_t status = sai_api_initialize(0, (sai_service_method_table_t*)&test_services);
     if (status != SAI_STATUS_SUCCESS)
     {

unittest/Makefile.am

@@ -1 +1 @@
-SUBDIRS = meta lib vslib syncd proxylib saidump
+SUBDIRS = meta lib vslib syncd proxylib saidump saisdkdump

unittest/saisdkdump/Makefile.am

@@ -0,0 +1,13 @@
+AM_CXXFLAGS = $(SAIINC) -I$(top_srcdir)/saisdkdump
+
+bin_PROGRAMS = tests
+
+LDADD_GTEST = -L/usr/src/gtest -lgtest -lgtest_main
+
+tests_SOURCES = main.cpp TestProfileMap.cpp
+
+tests_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
+tests_LDADD = $(LDADD_GTEST) $(top_srcdir)/saisdkdump/libsaisdkdump_profile.a \
+              -lswsscommon -lpthread $(CODE_COVERAGE_LIBS)
+
+TESTS = tests