Skip to content

Add buffer pool stat to flex counter architecture #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 17 commits into from
May 26, 2019
Merged

Add buffer pool stat to flex counter architecture #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e13a365
Add control path to BUFFER_POOL_PLUGIN_LIST
wendani Apr 19, 2019
c013af2
Add metadata deserialization support for buffer pool stats
wendani Apr 19, 2019
a07ae29
Deserialize buffer pool counter id list to SAI stats
wendani Apr 19, 2019
5afb37c
Adjust code format to be consistent with the surroundings
wendani Apr 19, 2019
61c5956
Add function definition for buffer pool plugin list
wendani Apr 20, 2019
8e1068b
Implement setBufferPoolCounterList
wendani Apr 20, 2019
5a3c9d3
Implement removeBufferPool which is the removal counterpart to
wendani Apr 20, 2019
aa9f030
Add construtor implementation for BufferPoolCounterIds;
wendani Apr 20, 2019
3e5bee2
Add buffer pool lua script to plugins to run
wendani Apr 22, 2019
6ee06a6
Add buffer pool stat in data collection
wendani Apr 23, 2019
1bdd85c
Resolve compliation error
wendani Apr 23, 2019
7289607
Reformat comments
wendani Apr 23, 2019
5a79c74
Update code format
wendani Apr 23, 2019
a0e6673
Remove debugging symbols
wendani Apr 23, 2019
13efeda
Merge remote-tracking branch 'origin/master' into buf_pool_stat_maste…
wendani May 24, 2019
abeb947
Correct compile error
wendani May 24, 2019
f39602f
Correct complie error
wendani May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions meta/sai_serialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 9 additions & 0 deletions meta/saiserialize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 28 additions & 0 deletions syncd/syncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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());
Expand Down
Loading