Skip to content

Watermark: test SAI clear api if the stats mode is READ_AND_CLEAR #427

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
merged 5 commits into from
May 25, 2019
Merged

Watermark: test SAI clear api if the stats mode is READ_AND_CLEAR #427

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a1d4cd
Test SAI clear api if the stats mode is READ_AND_CLEAR
wendani Nov 22, 2018
ce79e7a
Merge remote-tracking branch 'public/master' into wm_syncd
wendani Nov 22, 2018
75748b1
Merge remote-tracking branch 'public/master' into wm_syncd
wendani Dec 7, 2018
6ed583d
Merge remote-tracking branch 'public/master' into wm_syncd
wendani Feb 25, 2019
ec15ce2
Address compile error
wendani Feb 25, 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
76 changes: 56 additions & 20 deletions syncd/syncd_flex_counter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void FlexCounter::setQueueCounterList(

if (supportedIds.size() == 0)
{
SWSS_LOG_NOTICE("Queue %s does not has supported counters", sai_serialize_object_id(queueId).c_str());
SWSS_LOG_NOTICE("%s: queue %s does not has supported counters", instanceId.c_str(), sai_serialize_object_id(queueId).c_str());

// Remove flex counter if all counter IDs and plugins are unregistered
if (fc.isEmpty())
Expand Down Expand Up @@ -297,7 +297,7 @@ void FlexCounter::setPriorityGroupCounterList(

if (supportedIds.size() == 0)
{
SWSS_LOG_NOTICE("Priority group %s does not have supported counters", sai_serialize_object_id(priorityGroupId).c_str());
SWSS_LOG_NOTICE("%s: priority group %s does not have supported counters", instanceId.c_str(), sai_serialize_object_id(priorityGroupId).c_str());

// Remove flex counter if all counter IDs and plugins are unregistered
if (fc.isEmpty())
Expand Down Expand Up @@ -817,17 +817,21 @@ void FlexCounter::collectCounters(
static_cast<uint32_t>(queueCounterIds.size()),
(const sai_stat_id_t *)queueCounterIds.data(),
queueStats.data());
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("%s: failed to get stats of queue 0x%lx: %d", m_instanceId.c_str(), queueVid, status);
continue;
}
if (m_statsMode == SAI_STATS_MODE_READ_AND_CLEAR){
status = sai_metadata_sai_queue_api->clear_queue_stats(
queueId,
static_cast<uint32_t>(queueCounterIds.size()),
(const sai_stat_id_t *)queueCounterIds.data());
}

if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get stats of queue 0x%lx: %d", queueVid, status);
continue;
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("%s: failed to clear stats of queue 0x%lx: %d", m_instanceId.c_str(), queueVid, status);
continue;
}
}

// Push all counter values to a single vector
Expand Down Expand Up @@ -904,17 +908,21 @@ void FlexCounter::collectCounters(
static_cast<uint32_t>(priorityGroupCounterIds.size()),
(const sai_stat_id_t *)priorityGroupCounterIds.data(),
priorityGroupStats.data());
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("%s: failed to get %ld/%ld stats of PG 0x%lx: %d", m_instanceId.c_str(), priorityGroupCounterIds.size(), priorityGroupStats.size(), priorityGroupVid, status);
continue;
}
if (m_statsMode == SAI_STATS_MODE_READ_AND_CLEAR){
status = sai_metadata_sai_buffer_api->clear_ingress_priority_group_stats(
priorityGroupId,
static_cast<uint32_t>(priorityGroupCounterIds.size()),
(const sai_stat_id_t *)priorityGroupCounterIds.data());
}

if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get %ld/%ld stats of PG 0x%lx: %d", priorityGroupCounterIds.size(), priorityGroupStats.size(), priorityGroupVid, status);
continue;
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("%s: failed to clear %ld/%ld stats of PG 0x%lx: %d", m_instanceId.c_str(), priorityGroupCounterIds.size(), priorityGroupStats.size(), priorityGroupVid, status);
continue;
}
}

// Push all counter values to a single vector
Expand Down Expand Up @@ -1190,17 +1198,31 @@ void FlexCounter::saiUpdateSupportedQueueCounters(

if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_INFO("Counter %s is not supported on queue %s, rv: %s",
SWSS_LOG_NOTICE("%s: counter %s is not supported on queue %s, rv: %s",
m_instanceId.c_str(),
sai_serialize_queue_stat(counter).c_str(),
sai_serialize_object_id(queueId).c_str(),
sai_serialize_status(status).c_str());

continue;
}
else

if (m_statsMode == SAI_STATS_MODE_READ_AND_CLEAR)
{
supportedQueueCounters.insert(counter);
status = sai_metadata_sai_queue_api->clear_queue_stats(queueId, 1, (const sai_stat_id_t *)&counter);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE("%s: clear counter %s is not supported on queue %s, rv: %s",
m_instanceId.c_str(),
sai_serialize_queue_stat(counter).c_str(),
sai_serialize_object_id(queueId).c_str(),
sai_serialize_status(status).c_str());

continue;
}
}

supportedQueueCounters.insert(counter);
}
}

Expand All @@ -1219,17 +1241,31 @@ void FlexCounter::saiUpdateSupportedPriorityGroupCounters(

if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_INFO("Counter %s is not supported on PG %s, rv: %s",
SWSS_LOG_NOTICE("%s: counter %s is not supported on PG %s, rv: %s",
m_instanceId.c_str(),
sai_serialize_ingress_priority_group_stat(counter).c_str(),
sai_serialize_object_id(priorityGroupId).c_str(),
sai_serialize_status(status).c_str());

continue;
}
else

if (m_statsMode == SAI_STATS_MODE_READ_AND_CLEAR)
{
supportedPriorityGroupCounters.insert(counter);
status = sai_metadata_sai_buffer_api->clear_ingress_priority_group_stats(priorityGroupId, 1, (const sai_stat_id_t *)&counter);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE("%s: clear counter %s is not supported on PG %s, rv: %s",
m_instanceId.c_str(),
sai_serialize_ingress_priority_group_stat(counter).c_str(),
sai_serialize_object_id(priorityGroupId).c_str(),
sai_serialize_status(status).c_str());

continue;
}
}

supportedPriorityGroupCounters.insert(counter);
}
}

Expand Down