Update SAI pointer to latest master (#408)

* Update SAI pointer to latest master Signed-off-by: Marian Pritsak <marianp@mellanox.com> * Use SAI_EXTENSIONS_TYPE_MAX Signed-off-by: Marian Pritsak <marianp@mellanox.com>
sonic-net · Jan 18, 2019 · 8793562 · 8793562
1 parent b1b739b
commit 8793562
Show file tree

Hide file tree

Showing 24 changed files with 102 additions and 166 deletions.
diff --git a/SAI b/SAI
diff --git a/lib/inc/sai_redis_internal.h b/lib/inc/sai_redis_internal.h
@@ -3,64 +3,64 @@
 
 // object id
 
-#define REDIS_CREATE(OBJECT_TYPE,object_type)           \
-    sai_status_t redis_create_ ## object_type(          \
-            _Out_ sai_object_id_t *object_type ##_id,   \
-            _In_ sai_object_id_t switch_id,             \
-            _In_ uint32_t attr_count,                   \
-            _In_ const sai_attribute_t *attr_list)      \
-    {                                                   \
-        MUTEX();                                        \
-        SWSS_LOG_ENTER();                               \
-        return meta_sai_create_oid(                     \
-                SAI_OBJECT_TYPE_ ## OBJECT_TYPE,        \
-                object_type ## _id,                     \
-                switch_id,                              \
-                attr_count,                             \
-                attr_list,                              \
-                &redis_generic_create);                 \
+#define REDIS_CREATE(OBJECT_TYPE,object_type)                       \
+    sai_status_t redis_create_ ## object_type(                      \
+            _Out_ sai_object_id_t *object_type ##_id,               \
+            _In_ sai_object_id_t switch_id,                         \
+            _In_ uint32_t attr_count,                               \
+            _In_ const sai_attribute_t *attr_list)                  \
+    {                                                               \
+        MUTEX();                                                    \
+        SWSS_LOG_ENTER();                                           \
+        return meta_sai_create_oid(                                 \
+                (sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
+                object_type ## _id,                                 \
+                switch_id,                                          \
+                attr_count,                                         \
+                attr_list,                                          \
+                &redis_generic_create);                             \
     }
 
-#define REDIS_REMOVE(OBJECT_TYPE,object_type)           \
-    sai_status_t redis_remove_ ## object_type(          \
-            _In_ sai_object_id_t object_type ## _id)    \
-    {                                                   \
-        MUTEX();                                        \
-        SWSS_LOG_ENTER();                               \
-        return meta_sai_remove_oid(                     \
-                SAI_OBJECT_TYPE_ ## OBJECT_TYPE,        \
-                object_type ## _id,                     \
-                &redis_generic_remove);                 \
+#define REDIS_REMOVE(OBJECT_TYPE,object_type)                       \
+    sai_status_t redis_remove_ ## object_type(                      \
+            _In_ sai_object_id_t object_type ## _id)                \
+    {                                                               \
+        MUTEX();                                                    \
+        SWSS_LOG_ENTER();                                           \
+        return meta_sai_remove_oid(                                 \
+                (sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
+                object_type ## _id,                                 \
+                &redis_generic_remove);                             \
     }
 
-#define REDIS_SET(OBJECT_TYPE,object_type)              \
-    sai_status_t redis_set_ ##object_type ## _attribute(\
-            _In_ sai_object_id_t object_type ## _id,    \
-            _In_ const sai_attribute_t *attr)           \
-    {                                                   \
-        MUTEX();                                        \
-        SWSS_LOG_ENTER();                               \
-        return meta_sai_set_oid(                        \
-                SAI_OBJECT_TYPE_ ## OBJECT_TYPE,        \
-                object_type ## _id,                     \
-                attr,                                   \
-                &redis_generic_set);                    \
+#define REDIS_SET(OBJECT_TYPE,object_type)                          \
+    sai_status_t redis_set_ ##object_type ## _attribute(            \
+            _In_ sai_object_id_t object_type ## _id,                \
+            _In_ const sai_attribute_t *attr)                       \
+    {                                                               \
+        MUTEX();                                                    \
+        SWSS_LOG_ENTER();                                           \
+        return meta_sai_set_oid(                                    \
+                (sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
+                object_type ## _id,                                 \
+                attr,                                               \
+                &redis_generic_set);                                \
     }
 
-#define REDIS_GET(OBJECT_TYPE,object_type)              \
-    sai_status_t redis_get_ ##object_type ## _attribute(\
-            _In_ sai_object_id_t object_type ## _id,    \
-            _In_ uint32_t attr_count,                   \
-            _Inout_ sai_attribute_t *attr_list)         \
-    {                                                   \
-        MUTEX();                                        \
-        SWSS_LOG_ENTER();                               \
-        return meta_sai_get_oid(                        \
-                SAI_OBJECT_TYPE_ ## OBJECT_TYPE,        \
-                object_type ## _id,                     \
-                attr_count,                             \
-                attr_list,                              \
-                &redis_generic_get);                    \
+#define REDIS_GET(OBJECT_TYPE,object_type)                          \
+    sai_status_t redis_get_ ##object_type ## _attribute(            \
+            _In_ sai_object_id_t object_type ## _id,                \
+            _In_ uint32_t attr_count,                               \
+            _Inout_ sai_attribute_t *attr_list)                     \
+    {                                                               \
+        MUTEX();                                                    \
+        SWSS_LOG_ENTER();                                           \
+        return meta_sai_get_oid(                                    \
+                (sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
+                object_type ## _id,                                 \
+                attr_count,                                         \
+                attr_list,                                          \
+                &redis_generic_get);                                \
     }
 
 #define REDIS_GENERIC_QUAD(OT,ot)  \
@@ -145,7 +145,7 @@
     sai_status_t redis_get_ ## object_type ## _stats(               \
             _In_ sai_object_id_t object_type ## _id,                \
             _In_ uint32_t number_of_counters,                       \
-            _In_ const sai_ ## object_type ## _stat_t *counter_ids, \
+            _In_ const sai_stat_id_t *counter_ids, \
             _Out_ uint64_t *counters)                               \
     {                                                               \
         MUTEX();                                                    \
@@ -164,7 +164,7 @@
     sai_status_t redis_get_ ## object_type ## _stats_ext(           \
             _In_ sai_object_id_t object_type ## _id,                \
             _In_ uint32_t number_of_counters,                       \
-            _In_ const sai_ ## object_type ## _stat_t *counter_ids, \
+            _In_ const sai_stat_id_t *counter_ids, \
             _In_ sai_stats_mode_t mode,                             \
             _Out_ uint64_t *counters)                               \
     {                                                               \
@@ -184,7 +184,7 @@
     sai_status_t redis_clear_ ## object_type ## _stats(             \
             _In_ sai_object_id_t object_type ## _id,                \
             _In_ uint32_t number_of_counters,                       \
-            _In_ const sai_ ## object_type ## _stat_t *counter_ids) \
+            _In_ const sai_stat_id_t *counter_ids) \
     {                                                               \
         MUTEX();                                                    \
         SWSS_LOG_ENTER();                                           \

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 if DEBUG
 DBGFLAGS = -ggdb -D_DEBUG_

diff --git a/lib/src/sai_redis_generic_create.cpp b/lib/src/sai_redis_generic_create.cpp
@@ -88,7 +88,7 @@ sai_object_type_t sai_object_type_query(
 
     sai_object_type_t ot = (sai_object_type_t)((object_id >> 48) & 0xFF);
 
-    if (ot == SAI_OBJECT_TYPE_NULL || ot >= SAI_OBJECT_TYPE_MAX)
+    if (ot == SAI_OBJECT_TYPE_NULL || ot >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
         SWSS_LOG_ERROR("invalid object id 0x%lx", object_id);
 
@@ -156,7 +156,7 @@ sai_object_id_t redis_create_virtual_object_id(
     SWSS_LOG_ENTER();
 
     if ((object_type <= SAI_OBJECT_TYPE_NULL) ||
-            (object_type >= SAI_OBJECT_TYPE_MAX))
+            (object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
     {
         SWSS_LOG_THROW("invalid objct type: %d", object_type);
     }

diff --git a/lib/src/sai_redis_uburst.cpp b/lib/src/sai_redis_uburst.cpp
@@ -2,24 +2,12 @@
 #include "sai_redis_internal.h"
 
 REDIS_GENERIC_QUAD(TAM_MICROBURST,tam_microburst);
+REDIS_GENERIC_STATS(TAM_MICROBURST,tam_microburst);
 REDIS_GENERIC_QUAD(TAM_HISTOGRAM,tam_histogram);
 
-sai_status_t redis_get_tam_histogram_stats(
-        _In_ sai_object_id_t tam_histogram_id,
-        _Inout_ uint32_t *number_of_counters,
-        _Out_ uint64_t *counters)
-{
-    MUTEX();
-
-    SWSS_LOG_ENTER();
-
-    return SAI_STATUS_NOT_IMPLEMENTED;
-}
-
 const sai_uburst_api_t redis_uburst_api = {
 
     REDIS_GENERIC_QUAD_API(tam_microburst)
+    REDIS_GENERIC_STATS_API(tam_microburst)
     REDIS_GENERIC_QUAD_API(tam_histogram)
-
-    redis_get_tam_histogram_stats
 };
diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -1,5 +1,5 @@
 # since we have SAI sumbodule we will use submodule headers
-AM_CPPFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 if DEBUG
 DBGFLAGS = -ggdb -D_DEBUG_

diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp
@@ -5533,7 +5533,7 @@ sai_status_t meta_sai_validate_oid(
     SWSS_LOG_ENTER();
 
     if (object_type <= SAI_OBJECT_TYPE_NULL ||
-            object_type >= SAI_OBJECT_TYPE_MAX)
+            object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
         SWSS_LOG_ERROR("invalid object type specified: %d, FIXME", object_type);
         return SAI_STATUS_INVALID_PARAMETER;

diff --git a/meta/sai_serialize.h b/meta/sai_serialize.h
@@ -267,18 +267,6 @@ void sai_deserialize_free_queue_deadlock_ntf(
         _In_ uint32_t count,
         _In_ sai_queue_deadlock_notification_data_t* deadlock_data);
 
-void sai_deserialize_port_stat(
-        _In_ const std::string& s,
-        _Out_ sai_port_stat_t& stat);
-
-void sai_deserialize_queue_stat(
-        _In_ const std::string& s,
-        _Out_ sai_queue_stat_t& stat);
-
-void sai_deserialize_ingress_priority_group_stat(
-        _In_ const std::string& s,
-        _Out_ sai_ingress_priority_group_stat_t& stat);
-
 void sai_deserialize_ingress_priority_group_attr(
         _In_ const std::string& s,
         _Out_ sai_ingress_priority_group_attr_t& attr);

diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp
@@ -1603,7 +1603,7 @@ std::string sai_serialize_object_meta_key(
 
     std::string key;
 
-    if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_MAX)
+    if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
         SWSS_LOG_THROW("invalid object type value %s", sai_serialize_object_type(meta_key.objecttype).c_str());
     }
@@ -2631,7 +2631,7 @@ void sai_deserialize_object_meta_key(
 
     sai_deserialize_object_type(str_object_type, meta_key.objecttype);
 
-    if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_MAX)
+    if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
     {
         SWSS_LOG_THROW("invalid object type value %s", sai_serialize_object_type(meta_key.objecttype).c_str());
     }
@@ -2943,33 +2943,6 @@ void sai_deserialize_free_queue_deadlock_ntf(
     delete[] queue_deadlock;
 }
 
-void sai_deserialize_port_stat(
-        _In_ const std::string& s,
-        _Out_ sai_port_stat_t& stat)
-{
-    SWSS_LOG_ENTER();
-
-    sai_deserialize_enum(s, &sai_metadata_enum_sai_port_stat_t, (int32_t&)stat);
-}
-
-void sai_deserialize_queue_stat(
-        _In_ const std::string& s,
-        _Out_ sai_queue_stat_t& stat)
-{
-    SWSS_LOG_ENTER();
-
-    sai_deserialize_enum(s, &sai_metadata_enum_sai_queue_stat_t, (int32_t&)stat);
-}
-
-void sai_deserialize_ingress_priority_group_stat(
-        _In_ const std::string& s,
-        _Out_ sai_ingress_priority_group_stat_t& stat)
-{
-    SWSS_LOG_ENTER();
-
-    sai_deserialize_enum(s, &sai_metadata_enum_sai_ingress_priority_group_stat_t, (int32_t&)stat);
-}
-
 void sai_deserialize_ingress_priority_group_attr(
         _In_ const std::string& s,
         _Out_ sai_ingress_priority_group_attr_t& attr)

diff --git a/meta/tests.cpp b/meta/tests.cpp
@@ -40,7 +40,7 @@ sai_object_type_t sai_object_type_query(
     sai_object_type_t objecttype = (sai_object_type_t)((oid >> 48) & 0xFF);
 
     if ((objecttype <= SAI_OBJECT_TYPE_NULL) ||
-            (objecttype >= SAI_OBJECT_TYPE_MAX))
+            (objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
     {
         SWSS_LOG_THROW("invalid oid 0x%lx", oid);
     }
@@ -98,7 +98,7 @@ sai_object_id_t create_dummy_object_id(
     SWSS_LOG_ENTER();
 
     if ((object_type <= SAI_OBJECT_TYPE_NULL) ||
-            (object_type >= SAI_OBJECT_TYPE_MAX))
+            (object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
     {
         SWSS_LOG_THROW("invalid objct type: %d", object_type);
     }

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 bin_PROGRAMS = saidiscovery
 

diff --git a/saidump/Makefile.am b/saidump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 bin_PROGRAMS = saidump
 

diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 bin_PROGRAMS = saiplayer
 

diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 bin_PROGRAMS = saisdkdump
 

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta
+AM_CPPFLAGS = -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/SAI/experimental
 
 bin_PROGRAMS = syncd syncd_request_shutdown tests
 

diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -1816,7 +1816,7 @@ std::vector<T> extractCounterIdsGeneric(
     {
         std::string field = fvField(v);
         T counterId;
-        deserializeIdFn(field, counterId);
+        deserializeIdFn(field.c_str(), &counterId);
 
         counterIdList.push_back(counterId);
     }
@@ -1842,7 +1842,7 @@ sai_status_t getStatsGeneric(
     return getStatsFn(
             object_id,
             (uint32_t)counter_ids.size(),
-            counter_ids.data(),
+            (const sai_stat_id_t*)counter_ids.data(),
             counters.data());
 }
 
@@ -2626,7 +2626,7 @@ sai_status_t processEvent(
          * TODO: use metadata utils is object type valid.
          */
 
-        if (object_type == SAI_OBJECT_TYPE_NULL || object_type >= SAI_OBJECT_TYPE_MAX)
+        if (object_type == SAI_OBJECT_TYPE_NULL || object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
         {
             SWSS_LOG_THROW("undefined object type %s", sai_serialize_object_type(object_type).c_str());
         }
@@ -2906,7 +2906,7 @@ void processFlexCounterEvent(
                 for (const auto &str : idStrings)
                 {
                     sai_port_stat_t stat;
-                    sai_deserialize_port_stat(str, stat);
+                    sai_deserialize_port_stat(str.c_str(), &stat);
                     portCounterIds.push_back(stat);
                 }
                 FlexCounter::setPortCounterList(vid, rid, groupName, portCounterIds);
@@ -2917,7 +2917,7 @@ void processFlexCounterEvent(
                 for (const auto &str : idStrings)
                 {
                     sai_queue_stat_t stat;
-                    sai_deserialize_queue_stat(str, stat);
+                    sai_deserialize_queue_stat(str.c_str(), &stat);
                     queueCounterIds.push_back(stat);
                 }
                 FlexCounter::setQueueCounterList(vid, rid, groupName, queueCounterIds);
@@ -2940,7 +2940,7 @@ void processFlexCounterEvent(
                 for (const auto &str : idStrings)
                 {
                     sai_ingress_priority_group_stat_t stat;
-                    sai_deserialize_ingress_priority_group_stat(str, stat);
+                    sai_deserialize_ingress_priority_group_stat(str.c_str(), &stat);
                     pgCounterIds.push_back(stat);
                 }
                 FlexCounter::setPriorityGroupCounterList(vid, rid, groupName, pgCounterIds);

diff --git a/syncd/syncd_applyview.cpp b/syncd/syncd_applyview.cpp
@@ -6589,7 +6589,7 @@ void logViewObjectCount(
 
     bool asic_changes = false;
 
-    for (int i = SAI_OBJECT_TYPE_NULL + 1; i < SAI_OBJECT_TYPE_MAX; i++)
+    for (int i = SAI_OBJECT_TYPE_NULL + 1; i < SAI_OBJECT_TYPE_EXTENSIONS_MAX; i++)
     {
         sai_object_type_t ot = (sai_object_type_t)i;