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.

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

Fix issue: bulk counter feature cannot compile on platforms having no sai_bulk_object_get_stats/sai_bulk_object_clear_stats #1105

Merged
merged 3 commits into from
Sep 6, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ AC_MSG_ERROR("SAI headers API version and library version mismatch")])])
CXXFLAGS="$SAVED_FLAGS"
])])

AC_CHECK_FUNCS(sai_bulk_object_clear_stats sai_bulk_object_get_stats)

AC_OUTPUT(Makefile
meta/Makefile
lib/Makefile
Expand Down
8 changes: 8 additions & 0 deletions syncd/VendorSai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ sai_status_t VendorSai::bulkGetStats(
SWSS_LOG_ENTER();
VENDOR_CHECK_API_INITIALIZED();

#ifdef HAVE_SAI_BULK_OBJECT_GET_STATS
return sai_bulk_object_get_stats(
switchId,
object_type,
Expand All @@ -671,6 +672,9 @@ sai_status_t VendorSai::bulkGetStats(
mode,
object_statuses,
counters);
#else
return SAI_STATUS_NOT_IMPLEMENTED;
#endif
}

sai_status_t VendorSai::bulkClearStats(
Expand All @@ -687,6 +691,7 @@ sai_status_t VendorSai::bulkClearStats(
SWSS_LOG_ENTER();
VENDOR_CHECK_API_INITIALIZED();

#ifdef HAVE_SAI_BULK_OBJECT_CLEAR_STATS
return sai_bulk_object_clear_stats(
switchId,
object_type,
Expand All @@ -696,6 +701,9 @@ sai_status_t VendorSai::bulkClearStats(
counter_ids,
mode,
object_statuses);
#else
return SAI_STATUS_NOT_IMPLEMENTED;
#endif
}

// BULK QUAD OID
Expand Down