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

Jump to bottom

[orchagent] Support for aggregrate VOQ Counters. #3047

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[orchagent] Support for aggregrate VOQ Counters. #3047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fe29d7c
Added aggregate VOQ counters orchagent implementation.
vivekverma-arista Feb 7, 2024
3f067f6
Merge branch 'sonic-net:master' into aggVoq
vivekverma-arista Feb 12, 2024
cb6b968
Update portsorch.cpp
vivekverma-arista Feb 13, 2024
f625dbe
Merge branch 'master' into aggVoq
prsunny Mar 15, 2024
72aafec
Revert "Update portsorch.cpp"
viveksrao-arista May 16, 2024
0465818
Revert "Added aggregate VOQ counters orchagent implementation."
viveksrao-arista May 16, 2024
3df86c2
What I did?
viveksrao-arista May 16, 2024
8a9e3c6
Merge branch 'sonic-net:master' into aggVoq
vivekverma-arista May 28, 2024
789eafb
Merge branch 'master' into aggVoq
viveksrao-arista May 30, 2024
3a54c41
Merge branch 'master' into aggVoq
prsunny Jun 4, 2024
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 orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
/* Initialize queue tables */
m_queueTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_NAME_MAP));
m_voqTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_VOQ_NAME_MAP));
m_voqToPortNamTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_PORT_NAME_VOQ_MAP));
m_queuePortTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_PORT_MAP));
m_queueIndexTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_INDEX_MAP));
m_queueTypeTable = unique_ptr<Table>(new Table(m_counter_db.get(), COUNTERS_QUEUE_TYPE_MAP));
Expand Down Expand Up @@ -7269,6 +7270,7 @@ void PortsOrch::generateQueueMapPerPort(const Port& port, FlexCounterQueueStates
vector<FieldValueTuple> queuePortVector;
vector<FieldValueTuple> queueIndexVector;
vector<FieldValueTuple> queueTypeVector;
vector<FieldValueTuple> voqToPortNameVector;
std::vector<sai_object_id_t> queue_ids;

if (voq)
Expand Down Expand Up @@ -7317,6 +7319,7 @@ void PortsOrch::generateQueueMapPerPort(const Port& port, FlexCounterQueueStates
// flexcounter orch logic. Always enabled voq counters.
addQueueFlexCountersPerPortPerQueueIndex(port, queueIndex, true);
queuePortVector.emplace_back(id, sai_serialize_object_id(port.m_system_port_oid));
voqToPortNameVector.emplace_back(id, port.m_system_port_info.alias);
}
else
{
Expand All @@ -7337,6 +7340,7 @@ void PortsOrch::generateQueueMapPerPort(const Port& port, FlexCounterQueueStates
if (voq)
{
m_voqTable->set("", queueVector);
m_voqToPortNamTable->set("", voqToPortNameVector);
}
else
{
Expand Down
1 change: 1 addition & 0 deletions orchagent/portsorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ class PortsOrch : public Orch, public Subject
unique_ptr<Table> m_gearboxTable;
unique_ptr<Table> m_queueTable;
unique_ptr<Table> m_voqTable;
unique_ptr<Table> m_voqToPortNamTable;
unique_ptr<Table> m_queuePortTable;
unique_ptr<Table> m_queueIndexTable;
unique_ptr<Table> m_queueTypeTable;
Expand Down
Loading