Add buffer pool stat to flex counter architecture (sonic-net#451)

dmytroxshevchuk · May 26, 2019 · dcab09f · dcab09f
1 parent f93e27a
commit dcab09f
Show file tree

Hide file tree

Showing 5 changed files with 308 additions and 13 deletions.
diff --git a/meta/sai_serialize.h b/meta/sai_serialize.h
@@ -277,6 +277,10 @@ void sai_deserialize_ingress_priority_group_attr(
         _In_ const std::string& s,
         _Out_ sai_ingress_priority_group_attr_t& attr);
 
+void sai_deserialize_buffer_pool_stat(
+        _In_ const std::string& s,
+        _Out_ sai_buffer_pool_stat_t& stat);
+
 void sai_deserialize_queue_attr(
         _In_ const std::string& s,
         _Out_ sai_queue_attr_t& attr);

diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp
@@ -2968,6 +2968,15 @@ void sai_deserialize_ingress_priority_group_attr(
     sai_deserialize_enum(s, &sai_metadata_enum_sai_ingress_priority_group_attr_t, (int32_t&)attr);
 }
 
+void sai_deserialize_buffer_pool_stat(
+        _In_ const std::string& s,
+        _Out_ sai_buffer_pool_stat_t& stat)
+{
+    SWSS_LOG_ENTER();
+
+    sai_deserialize_enum(s, &sai_metadata_enum_sai_buffer_pool_stat_t, (int32_t&)stat);
+}
+
 void sai_deserialize_queue_attr(
         _In_ const std::string& s,
         _Out_ sai_queue_attr_t& attr)

diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -2831,6 +2831,14 @@ void processFlexCounterGroupEvent(
                     FlexCounter::addPortCounterPlugin(sha, groupName);
                 }
             }
+            else if (field == BUFFER_POOL_PLUGIN_FIELD)
+            {
+                auto shaStrings = swss::tokenize(value, ',');
+                for (const auto &sha : shaStrings)
+                {
+                    FlexCounter::addBufferPoolCounterPlugin(sha, groupName);
+                }
+            }
             else if (field == FLEX_COUNTER_STATUS_FIELD)
             {
                 FlexCounter::updateFlexCounterStatus(value, groupName);
@@ -2894,6 +2902,10 @@ void processFlexCounterEvent(
         {
             FlexCounter::removeRif(vid, groupName);
         }
+        else if (objectType == SAI_OBJECT_TYPE_BUFFER_POOL)
+        {
+            FlexCounter::removeBufferPool(vid, groupName);
+        }
         else
         {
             SWSS_LOG_ERROR("Object type for removal not supported, %s", objectTypeStr.c_str());
@@ -2919,6 +2931,7 @@ void processFlexCounterEvent(
                     sai_deserialize_port_stat(str.c_str(), &stat);
                     portCounterIds.push_back(stat);
                 }
+
                 FlexCounter::setPortCounterList(vid, rid, groupName, portCounterIds);
             }
             else if (objectType == SAI_OBJECT_TYPE_QUEUE && field == QUEUE_COUNTER_ID_LIST)
@@ -2930,6 +2943,7 @@ void processFlexCounterEvent(
                     sai_deserialize_queue_stat(str.c_str(), &stat);
                     queueCounterIds.push_back(stat);
                 }
+
                 FlexCounter::setQueueCounterList(vid, rid, groupName, queueCounterIds);
             }
             else if (objectType == SAI_OBJECT_TYPE_QUEUE && field == QUEUE_ATTR_ID_LIST)
@@ -2953,6 +2967,7 @@ void processFlexCounterEvent(
                     sai_deserialize_ingress_priority_group_stat(str.c_str(), &stat);
                     pgCounterIds.push_back(stat);
                 }
+
                 FlexCounter::setPriorityGroupCounterList(vid, rid, groupName, pgCounterIds);
             }
             else if (objectType == SAI_OBJECT_TYPE_INGRESS_PRIORITY_GROUP && field == PG_ATTR_ID_LIST)
@@ -2976,8 +2991,21 @@ void processFlexCounterEvent(
                     sai_deserialize_router_interface_stat(str.c_str(), &stat);
                     rifCounterIds.push_back(stat);
                 }
+
                 FlexCounter::setRifCounterList(vid, rid, groupName, rifCounterIds);
             }
+            else if (objectType == SAI_OBJECT_TYPE_BUFFER_POOL && field == BUFFER_POOL_COUNTER_ID_LIST)
+            {
+                std::vector<sai_buffer_pool_stat_t> bufferPoolCounterIds;
+                for (const auto &str : idStrings)
+                {
+                    sai_buffer_pool_stat_t stat;
+                    sai_deserialize_buffer_pool_stat(str, stat);
+                    bufferPoolCounterIds.push_back(stat);
+                }
+
+                FlexCounter::setBufferPoolCounterList(vid, rid, groupName, bufferPoolCounterIds);
+            }
             else
             {
                 SWSS_LOG_ERROR("Object type and field combination is not supported, object type %s, field %s", objectTypeStr.c_str(), field.c_str());