Add sai_decimal_p2_t for decimal with presion 2

Signed-off-by: Jimmy Jin <[email protected]>
opencomputeproject · Nov 14, 2023 · 911f289 · 911f289
1 parent b4331a0
commit 911f289
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 1 deletion.
diff --git a/inc/saitypes.h b/inc/saitypes.h
@@ -131,6 +131,7 @@ typedef size_t sai_size_t;
 typedef uint64_t sai_object_id_t;
 typedef void *sai_pointer_t;
 typedef uint64_t sai_api_version_t;
+typedef double sai_decimal_p2_t;
 
 typedef struct _sai_timespec_t
 {
@@ -1519,6 +1520,9 @@ typedef union _sai_attribute_value_t
 
     /** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_PORT_SNR_LIST */
     sai_port_snr_list_t portsnrlist;
+
+    /** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_DECIMAL_P2 */
+    sai_decimal_p2_t decimalp2;
 } sai_attribute_value_t;
 
 /**

diff --git a/meta/Makefile b/meta/Makefile
@@ -35,7 +35,6 @@ WARNINGS = \
 	-Werror \
 	-Wextra \
 	-Wextra \
-	-Wfloat-equal \
 	-Wformat=2 \
 	-Wformat-nonliteral \
 	-Wformat-security \

diff --git a/meta/parse.pl b/meta/parse.pl
@@ -72,6 +72,8 @@
 my $FLAGS = "MANDATORY_ON_CREATE|CREATE_ONLY|CREATE_AND_SET|READ_ONLY|KEY";
 my $ENUM_FLAGS_TYPES = "(none|strict|mixed|ranges|free)";
 
+my $DECIMAL_P2_REGEX = '([+-]?([0-9]*[.])?[0-9]{0,2})';
+
 # TAGS HANDLERS
 
 my %ATTR_TAGS = (
@@ -365,6 +367,8 @@ sub ProcessTagDefault
 
     return $val if $val =~ /^ffff\:ffff\:ffff\:ffff\:ffff\:ffff\:ffff\:ffff$/;
 
+    return $val if $val =~ /^$DECIMAL_P2_REGEX$/;
+
     LogError "invalid default tag value '$val' on $type $value";
     return undef;
 }
@@ -1492,6 +1496,11 @@ sub ProcessType
         return "SAI_ATTR_VALUE_TYPE_INT32_LIST";
     }
 
+    if ($type eq "sai_decimal_p2_t")
+    {
+        return "SAI_ATTR_VALUE_TYPE_DECIMAL_P2";
+    }
+
     if ($type =~ /^(sai_\w+_t)$/)
     {
         my $prefix = "SAI_ATTR_VALUE_TYPE";
@@ -1647,6 +1656,8 @@ sub ProcessDefaultValueType
 
     return "SAI_DEFAULT_VALUE_TYPE_CONST" if $default =~ /^ffff\:ffff\:ffff\:ffff\:ffff\:ffff\:ffff\:ffff$/;
 
+    return "SAI_DEFAULT_VALUE_TYPE_CONST" if $default =~ /^$DECIMAL_P2_REGEX$/;
+
     LogError "invalid default value type '$default' on $attr";
 
     return "";
@@ -1722,6 +1733,10 @@ sub ProcessDefaultValue
     {
         WriteSource "$val = { .mac = { 0, 0, 0, 0, 0, 0 } };";
     }
+    elsif ($default =~ /^$DECIMAL_P2_REGEX$/ and $type =~ /^sai_decimal_p2_t/)
+    {
+        WriteSource "$val = { .$VALUE_TYPES{$type} = $default };";
+    }
     else
     {
         LogError "invalid default value '$default' on $attr ($type)";
@@ -4662,6 +4677,7 @@ sub ProcessStructItem
     return if $type =~ /^sai_(u?int\d+|ip[46]|mac|cos|vlan_id|queue_index)_t/; # primitives, we could get that from defines
     return if $type =~ /^u?int\d+_t/;
     return if $type =~ /^sai_[su]\d+_list_t/;
+    return if $type =~ /^sai_decimal_p2_t/;
 
     if ($type eq "sai_object_id_t" or $type eq "sai_object_list_t")
     {

diff --git a/meta/saimetadatatypes.h b/meta/saimetadatatypes.h
@@ -111,6 +111,11 @@ typedef enum _sai_attr_value_type_t
      */
     SAI_ATTR_VALUE_TYPE_INT64,
 
+    /**
+     * @brief Attribute value is decimal p2.
+     */
+    SAI_ATTR_VALUE_TYPE_DECIMAL_P2,
+
     /**
      * @brief Attribute value is pointer address.
      */

diff --git a/meta/saimetadatautils.c b/meta/saimetadatautils.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 #include <sai.h>
 #include "saimetadatautils.h"
 #include "saimetadata.h"
@@ -376,6 +377,9 @@ static bool sai_metadata_is_condition_value_eq(
         case SAI_ATTR_VALUE_TYPE_UINT64:
             return cvalue->u64 == value->u64;
 
+        case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
+            return fabs(cvalue->decimalp2 - value->decimalp2) < 1E-2;
+
         default:
 
             /*

diff --git a/meta/saisanitycheck.c b/meta/saisanitycheck.c
@@ -665,6 +665,7 @@ void check_attr_object_type_provided(
         case SAI_ATTR_VALUE_TYPE_VLAN_LIST:
         case SAI_ATTR_VALUE_TYPE_UINT32:
         case SAI_ATTR_VALUE_TYPE_UINT64:
+        case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
         case SAI_ATTR_VALUE_TYPE_MAC:
         case SAI_ATTR_VALUE_TYPE_POINTER:
         case SAI_ATTR_VALUE_TYPE_IP_ADDRESS:
@@ -946,6 +947,7 @@ void check_attr_default_required(
         case SAI_ATTR_VALUE_TYPE_UINT16:
         case SAI_ATTR_VALUE_TYPE_UINT32:
         case SAI_ATTR_VALUE_TYPE_UINT64:
+        case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
         case SAI_ATTR_VALUE_TYPE_MAC:
         case SAI_ATTR_VALUE_TYPE_IP_ADDRESS:
         case SAI_ATTR_VALUE_TYPE_IP_PREFIX:
@@ -1415,6 +1417,7 @@ void check_attr_conditions(
             case SAI_ATTR_VALUE_TYPE_UINT16:
             case SAI_ATTR_VALUE_TYPE_UINT32:
             case SAI_ATTR_VALUE_TYPE_UINT64:
+            case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
 
                 /* number conditions */
 
@@ -1622,6 +1625,7 @@ void check_attr_validonly(
             case SAI_ATTR_VALUE_TYPE_UINT16:
             case SAI_ATTR_VALUE_TYPE_UINT32:
             case SAI_ATTR_VALUE_TYPE_UINT64:
+            case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
                 break;
 
             default:
@@ -2517,6 +2521,7 @@ void check_attr_existing_objects(
         case SAI_ATTR_VALUE_TYPE_UINT32:
         case SAI_ATTR_VALUE_TYPE_UINT64:
         case SAI_ATTR_VALUE_TYPE_UINT8:
+        case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
 
             /*
              * Primitives we can skip for now, just left as was set by user
@@ -2774,6 +2779,7 @@ void check_attr_is_primitive(
         case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
         case SAI_ATTR_VALUE_TYPE_FABRIC_PORT_REACHABILITY:
         case SAI_ATTR_VALUE_TYPE_LATCH_STATUS:
+        case SAI_ATTR_VALUE_TYPE_DECIMAL_P2:
 
             if (!md->isprimitive)
             {

diff --git a/meta/saiserialize.c b/meta/saiserialize.c
@@ -1355,3 +1355,17 @@ int sai_deserialize_attribute(
 
     return (int)(buf - buffer);
 }
+
+int sai_serialize_decimal_p2(
+        _Out_ char *buffer,
+        _In_ sai_decimal_p2_t decimal)
+{
+    return sprintf(buffer, "%.2lf", decimal);
+}
+
+int sai_deserialize_decimal_p2(
+        _In_ const char *buffer,
+        _Out_ sai_decimal_p2_t *decimal)
+{
+    return sscanf(buffer, "%lf", decimal);
+}
diff --git a/meta/saiserialize.h b/meta/saiserialize.h
@@ -877,6 +877,32 @@ void sai_free_attribute(
         _In_ const sai_attr_metadata_t *meta,
         _In_ const sai_attribute_t *attribute);
 
+/**
+ * @brief Serialize decimal p2.
+ *
+ * @param[out] buffer Output buffer for serialized value.
+ * @param[in] decimal Decimal_p2 to be serialized.
+ *
+ * @return Number of characters written to buffer excluding '\0',
+ * or #SAI_SERIALIZE_ERROR on error.
+ */
+int sai_serialize_decimal_p2(
+        _Out_ char *buffer,
+        _In_ sai_decimal_p2_t decimal);
+
+/**
+ * @brief Deserialize decimal p2.
+ *
+ * @param[in] buffer Input buffer to be examined.
+ * @param[out] decimal Deserialized value.
+ *
+ * @return Number of characters consumed from the buffer,
+ * or #SAI_SERIALIZE_ERROR on error.
+ */
+int sai_deserialize_decimal_p2(
+        _In_ const char *buffer,
+        _Out_ sai_decimal_p2_t *decimal);
+
 /**
  * @}
  */

diff --git a/meta/serialize.pm b/meta/serialize.pm
@@ -313,6 +313,11 @@ sub GetTypeInfoForSerialize
         $TypeInfo{needQuote} = 1;
         $TypeInfo{deamp} = "&";
     }
+    elsif ($type =~ m/^sai_decimal_p2_t$/)
+    {
+        $TypeInfo{suffix} = "decimal_p2";
+        $TypeInfo{deamp} = "&";
+    }
     elsif ($type =~ /^sai_pointer_t$/)
     {
         # need quote since "ptr:" is added on serialize