Make changes to support compiling on Bookworm (with GCC 12) (#1344)

This adds support for sairedis to compile on Debian Bookworm (with GCC 12). This PR also includes a SAI submodule update that brings in other unrelated changes; this is needed because of a change in Doxyfile that would cause warnings/errors in newer versions of Doxygen.
sonic-net · Feb 2, 2024 · e5b8d4e · e5b8d4e
1 parent 5b2a517
commit e5b8d4e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 1 deletion.
diff --git a/SAI b/SAI
diff --git a/lib/sai_redis_tam.cpp b/lib/sai_redis_tam.cpp
@@ -23,6 +23,7 @@ REDIS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
 REDIS_GENERIC_QUAD(TAM_COLLECTOR,tam_collector);
 REDIS_GENERIC_QUAD(TAM_EVENT_ACTION,tam_event_action);
 REDIS_GENERIC_QUAD(TAM_EVENT,tam_event);
+REDIS_GENERIC_QUAD(TAM_COUNTER_SUBSCRIPTION,tam_counter_subscription);
 
 const sai_tam_api_t redis_tam_api = {
 
@@ -37,4 +38,5 @@ const sai_tam_api_t redis_tam_api = {
     REDIS_GENERIC_QUAD_API(tam_collector)
     REDIS_GENERIC_QUAD_API(tam_event_action)
     REDIS_GENERIC_QUAD_API(tam_event)
+    REDIS_GENERIC_QUAD_API(tam_counter_subscription)
 };
diff --git a/syncd/ServiceMethodTable.cpp b/syncd/ServiceMethodTable.cpp
@@ -2,6 +2,7 @@
 
 #include "swss/logger.h"
 
+#include <array>
 #include <utility>
 
 using namespace syncd;

diff --git a/syncd/SwitchNotifications.cpp b/syncd/SwitchNotifications.cpp
@@ -1,6 +1,7 @@
 #include "SwitchNotifications.h"
 
 #include "swss/logger.h"
+#include <array>
 
 using namespace syncd;
 

diff --git a/unittest/lib/test_sai_redis_tam.cpp b/unittest/lib/test_sai_redis_tam.cpp
@@ -70,6 +70,11 @@ TEST(libsairedis, tam)
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tam_event(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tam_event_attribute(0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tam_event_attribute(0,0,0));
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->create_tam_counter_subscription(&id,0,0,0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tam_counter_subscription(0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tam_counter_subscription_attribute(0,0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tam_counter_subscription_attribute(0,0,0));
 }
 
 TEST(libsairedis, sai_tam_telemetry_get_data)

diff --git a/unittest/vslib/test_sai_vs_tam.cpp b/unittest/vslib/test_sai_vs_tam.cpp
@@ -70,6 +70,11 @@ TEST(libsaivs, tam)
     EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tam_event(0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tam_event_attribute(0,0));
     EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tam_event_attribute(0,0,0));
+
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->create_tam_counter_subscription(&id,0,0,0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->remove_tam_counter_subscription(0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->set_tam_counter_subscription_attribute(0,0));
+    EXPECT_NE(SAI_STATUS_SUCCESS, api->get_tam_counter_subscription_attribute(0,0,0));
 }
 
 TEST(libsairedis, sai_tam_telemetry_get_data)

diff --git a/vslib/sai_vs_tam.cpp b/vslib/sai_vs_tam.cpp
@@ -23,6 +23,7 @@ VS_GENERIC_QUAD(TAM_TELEMETRY,tam_telemetry);
 VS_GENERIC_QUAD(TAM_COLLECTOR,tam_collector);
 VS_GENERIC_QUAD(TAM_EVENT_ACTION,tam_event_action);
 VS_GENERIC_QUAD(TAM_EVENT,tam_event);
+VS_GENERIC_QUAD(TAM_COUNTER_SUBSCRIPTION,tam_counter_subscription);
 
 const sai_tam_api_t vs_tam_api = {
 
@@ -37,5 +38,6 @@ const sai_tam_api_t vs_tam_api = {
     VS_GENERIC_QUAD_API(tam_collector)
     VS_GENERIC_QUAD_API(tam_event_action)
     VS_GENERIC_QUAD_API(tam_event)
+    VS_GENERIC_QUAD_API(tam_counter_subscription)
 
 };