Skip to content

Commit 57ed180

Browse files
[configure.ac] implement SAI API version check (sonic-net#1000)
Signed-off-by: Stepan Blyschak [email protected] The motivation for this change is described in the proposal sonic-net/SONiC#935 and proposal in SAI opencomputeproject/SAI#1404 NOTE: Requires to update SAI once opencomputeproject/SAI#1404 is in.
1 parent 8894dc7 commit 57ed180

File tree

4 files changed

+61
-1
lines changed

4 files changed

+61
-1
lines changed

configure.ac

+23
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,29 @@ AC_SUBST(CXXFLAGS_COMMON)
182182

183183
AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\$(top_srcdir)/SAI/meta")
184184

185+
AM_COND_IF([SYNCD], [
186+
AM_COND_IF([SAIVS], [], [
187+
SAVED_FLAGS="$CXXFLAGS"
188+
CXXFLAGS="-lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta"
189+
AC_MSG_CHECKING([SAI headers API version and library version check])
190+
AC_TRY_RUN([
191+
extern "C" {
192+
#include <sai.h>
193+
}
194+
int main() {
195+
sai_api_version_t version;
196+
if (SAI_STATUS_SUCCESS != sai_query_api_version(&version))
197+
{
198+
return 1;
199+
}
200+
return (version != SAI_API_VERSION);
201+
}],
202+
[AC_MSG_RESULT(ok)],
203+
[AC_MSG_RESULT(failed)
204+
AC_MSG_ERROR("SAI headers API version and library version mismatch")])
205+
CXXFLAGS="$SAVED_FLAGS"
206+
])])
207+
185208
AC_OUTPUT(Makefile
186209
meta/Makefile
187210
lib/Makefile

lib/sai_redis_interfacequery.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,11 @@ sai_status_t sai_query_stats_capability(
240240

241241
return SAI_STATUS_NOT_IMPLEMENTED;
242242
}
243+
244+
sai_status_t sai_query_api_version(
245+
_Out_ sai_api_version_t *version)
246+
{
247+
SWSS_LOG_ENTER();
248+
249+
return SAI_STATUS_NOT_IMPLEMENTED;
250+
}

syncd/VendorSai.cpp

+21-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "swss/logger.h"
66

7+
#include <cinttypes>
78
#include <cstring>
89

910
using namespace syncd;
@@ -57,9 +58,28 @@ sai_status_t VendorSai::initialize(
5758
return SAI_STATUS_INVALID_PARAMETER;
5859
}
5960

61+
sai_api_version_t version{};
62+
auto status = sai_query_api_version(&version);
63+
if (status != SAI_STATUS_SUCCESS)
64+
{
65+
SWSS_LOG_ERROR("failed to query SAI API version");
66+
67+
return status;
68+
}
69+
70+
SWSS_LOG_NOTICE("SAI API version: %" PRId64, version);
71+
72+
if (version != SAI_API_VERSION)
73+
{
74+
SWSS_LOG_ERROR("SAI implementation API version %" PRId64 " does not match SAI headers API version %" PRId64,
75+
version, SAI_API_VERSION);
76+
77+
return SAI_STATUS_FAILURE;
78+
}
79+
6080
memcpy(&m_service_method_table, service_method_table, sizeof(m_service_method_table));
6181

62-
auto status = sai_api_initialize(flags, service_method_table);
82+
status = sai_api_initialize(flags, service_method_table);
6383

6484
if (status == SAI_STATUS_SUCCESS)
6585
{

vslib/sai_vs_interfacequery.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,12 @@ sai_status_t sai_query_stats_capability(
192192

193193
return vs_sai->queryStatsCapability(switch_id, object_type, stats_capability);
194194
}
195+
196+
sai_status_t sai_query_api_version(
197+
_Out_ sai_api_version_t *version)
198+
{
199+
SWSS_LOG_ENTER();
200+
201+
*version = SAI_API_VERSION;
202+
return SAI_STATUS_SUCCESS;
203+
}

0 commit comments

Comments
 (0)