From 3c315f0fff93aa072472abc10815963ac0035268 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 12 Aug 2022 09:26:11 +0200
Subject: Adding upstream version 1.36.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 ml/Dimension.cc | 55 +++----------------------------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

(limited to 'ml/Dimension.cc')

diff --git a/ml/Dimension.cc b/ml/Dimension.cc
index 3146e45a6..0fe07530c 100644
--- a/ml/Dimension.cc
+++ b/ml/Dimension.cc
@@ -6,55 +6,6 @@
 
 using namespace ml;
 
-/*
- * Copy of the unpack_storage_number which allows us to convert
- * a storage_number to double.
- */
-static CalculatedNumber unpack_storage_number_dbl(storage_number value) {
-    if(!value)
-        return 0;
-
-    int sign = 0, exp = 0;
-    int factor = 10;
-
-    // bit 32 = 0:positive, 1:negative
-    if(unlikely(value & (1 << 31)))
-        sign = 1;
-
-    // bit 31 = 0:divide, 1:multiply
-    if(unlikely(value & (1 << 30)))
-        exp = 1;
-
-    // bit 27 SN_EXISTS_100
-    if(unlikely(value & (1 << 26)))
-        factor = 100;
-
-    // bit 26 SN_EXISTS_RESET
-    // bit 25 SN_ANOMALY_BIT
-
-    // bit 30, 29, 28 = (multiplier or divider) 0-7 (8 total)
-    int mul = (value & ((1<<29)|(1<<28)|(1<<27))) >> 27;
-
-    // bit 24 to bit 1 = the value, so remove all other bits
-    value ^= value & ((1<<31)|(1<<30)|(1<<29)|(1<<28)|(1<<27)|(1<<26)|(1<<25)|(1<<24));
-
-    CalculatedNumber CN = value;
-
-    if(exp) {
-        for(; mul; mul--)
-            CN *= factor;
-    }
-    else {
-        for( ; mul ; mul--)
-            CN /= 10;
-    }
-
-    if(sign)
-        CN = -CN;
-
-    return CN;
-}
-
 std::pair<CalculatedNumber *, size_t>
 TrainableDimension::getCalculatedNumbers() {
     size_t MinN = Cfg.MinTrainSamples;
@@ -89,10 +40,10 @@ TrainableDimension::getCalculatedNumbers() {
             break;
 
         auto P = Q.nextMetric();
-        storage_number SN = P.second;
+        CalculatedNumber Value = P.second;
 
-        if (does_storage_number_exist(SN)) {
-            CNs[Idx] = unpack_storage_number_dbl(SN);
+        if (netdata_double_isnumber(Value)) {
+            CNs[Idx] = Value;
             LastValue = CNs[Idx];
             CollectedValues++;
         } else
-- 
cgit v1.2.3