Skip to content
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

[flex_counter] Add sairedis support for drop counters #520

Merged
merged 13 commits into from
Nov 12, 2019
Merged

[flex_counter] Add sairedis support for drop counters #520

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9aa7a51
[flex_counter] Add support for polling port-level debug counters
daall Sep 20, 2019
8d15208
Remove uneccesary includes
daall Sep 25, 2019
4d6ecff
Add stubs for querying sai capabilities
daall Sep 29, 2019
b464491
Add support for serializing debug counter attributes
daall Sep 30, 2019
ed1541b
Add support for switch level debug counters
daall Sep 30, 2019
60b1cdc
Improve vslib support for debug counters
daall Oct 7, 2019
3e36753
Remove interface query stubs
daall Oct 28, 2019
2fb3152
Add missing swss log
daall Oct 28, 2019
961dbb4
Clean-up virtual switch implementation
daall Oct 30, 2019
9b9e0c8
Simplify vs debug counters
daall Nov 1, 2019
8d6970f
Remove unnecessary includes
daall Nov 1, 2019
e0ab69e
Fix formatting
daall Nov 1, 2019
b7eb1b1
Respond to review comments
daall Nov 1, 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
9 changes: 9 additions & 0 deletions meta/sai_serialize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ std::string sai_serialize_common_api(
std::string sai_serialize_port_stat(
_In_ const sai_port_stat_t counter);

std::string sai_serialize_switch_stat(
_In_ const sai_switch_stat_t counter);

std::string sai_serialize_port_pool_stat(
_In_ const sai_port_pool_stat_t counter);

Expand Down Expand Up @@ -135,6 +138,12 @@ std::string sai_serialize_mac(
std::string sai_serialize_port_oper_status(
_In_ sai_port_oper_status_t status);

std::string sai_serialize_ingress_drop_reason(
_In_ const sai_in_drop_reason_t reason);

std::string sai_serialize_egress_drop_reason(
_In_ const sai_out_drop_reason_t reason);

std::string sai_serialize_l2mc_entry_type(
_In_ const sai_l2mc_entry_type_t type);

Expand Down
24 changes: 24 additions & 0 deletions meta/saiserialize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,14 @@ std::string sai_serialize_port_stat(
return sai_serialize_enum(counter, &sai_metadata_enum_sai_port_stat_t);
}

std::string sai_serialize_switch_stat(
_In_ const sai_switch_stat_t counter)
{
SWSS_LOG_ENTER();

return sai_serialize_enum(counter, &sai_metadata_enum_sai_switch_stat_t);
}

std::string sai_serialize_port_pool_stat(
_In_ const sai_port_pool_stat_t counter)
{
Expand Down Expand Up @@ -898,6 +906,22 @@ std::string sai_serialize_switch_oper_status(
return j.dump();
}

std::string sai_serialize_ingress_drop_reason(
_In_ const sai_in_drop_reason_t reason)
{
SWSS_LOG_ENTER();

return sai_serialize_enum(reason, &sai_metadata_enum_sai_in_drop_reason_t);
}

std::string sai_serialize_egress_drop_reason(
_In_ const sai_out_drop_reason_t reason)
{
SWSS_LOG_ENTER();

return sai_serialize_enum(reason, &sai_metadata_enum_sai_out_drop_reason_t);
}

std::string sai_serialize_switch_shutdown_request(
_In_ sai_object_id_t switch_id)
{
Expand Down
29 changes: 29 additions & 0 deletions syncd/syncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3376,6 +3376,7 @@ void processFlexCounterEvent(
if (objectType == SAI_OBJECT_TYPE_PORT)
{
FlexCounter::removePort(vid, groupName);
FlexCounter::removePortDebugCounters(vid, groupName);
}
else if (objectType == SAI_OBJECT_TYPE_QUEUE)
{
Expand All @@ -3393,6 +3394,10 @@ void processFlexCounterEvent(
{
FlexCounter::removeBufferPool(vid, groupName);
}
else if (objectType == SAI_OBJECT_TYPE_SWITCH)
{
FlexCounter::removeSwitchDebugCounters(vid, groupName);
}
else
{
SWSS_LOG_ERROR("Object type for removal not supported, %s", objectTypeStr.c_str());
Expand Down Expand Up @@ -3423,6 +3428,18 @@ void processFlexCounterEvent(

FlexCounter::setPortCounterList(vid, rid, groupName, portCounterIds);
}
else if (objectType == SAI_OBJECT_TYPE_PORT && field == PORT_DEBUG_COUNTER_ID_LIST)
{
std::vector<sai_port_stat_t> portDebugCounterIds;
for (const auto &str : idStrings)
{
sai_port_stat_t stat;
sai_deserialize_port_stat(str.c_str(), &stat);
portDebugCounterIds.push_back(stat);
}

FlexCounter::setPortDebugCounterList(vid, rid, groupName, portDebugCounterIds);
}
else if (objectType == SAI_OBJECT_TYPE_QUEUE && field == QUEUE_COUNTER_ID_LIST)
{
std::vector<sai_queue_stat_t> queueCounterIds;
Expand Down Expand Up @@ -3483,6 +3500,18 @@ void processFlexCounterEvent(

FlexCounter::setRifCounterList(vid, rid, groupName, rifCounterIds);
}
else if (objectType == SAI_OBJECT_TYPE_SWITCH && field == SWITCH_DEBUG_COUNTER_ID_LIST)
{
std::vector<sai_switch_stat_t> switchCounterIds;
for (const auto &str : idStrings)
{
sai_switch_stat_t stat;
sai_deserialize_switch_stat(str.c_str(), &stat);
switchCounterIds.push_back(stat);
}

FlexCounter::setSwitchDebugCounterList(vid, rid, groupName, switchCounterIds);
}
else if (objectType == SAI_OBJECT_TYPE_BUFFER_POOL && field == BUFFER_POOL_COUNTER_ID_LIST)
{
counterIds = idStrings;
Expand Down
Loading