diff options
| author | eportnov <eportnov@ibs.ru> | 2022-09-08 17:51:50 +0300 |
|---|---|---|
| committer | eportnov <eportnov@ibs.ru> | 2022-09-09 10:45:13 +0300 |
| commit | fb5c6042a6239dd26f4a537cbf5141c45f842532 (patch) | |
| tree | 47e5a10d400ebf40f93d2490b20b98936d8a31f3 /meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces | |
| parent | fad250335f979582992068be13d212d76a0d528a (diff) | |
| download | openbmc-fb5c6042a6239dd26f4a537cbf5141c45f842532.tar.xz | |
bugfix circular buffer
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces')
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0013-bugfix-telemetry-circular-buffer.patch | 43 | ||||
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0013-bugfix-telemetry-circular-buffer.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0013-bugfix-telemetry-circular-buffer.patch new file mode 100644 index 0000000000..9f7f538dbd --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb/0013-bugfix-telemetry-circular-buffer.patch @@ -0,0 +1,43 @@ +From 38a09080bb7bb43700b2fb021cd20137e7a3acad Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Thu, 8 Sep 2022 17:38:05 +0300 +Subject: [PATCH] bugfix telemetry circular buffer + +--- + include/dbus_utility.hpp | 2 ++ + redfish-core/lib/metric_report.hpp | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/dbus_utility.hpp b/include/dbus_utility.hpp +index 05adb1e6..3aa694b7 100644 +--- a/include/dbus_utility.hpp ++++ b/include/dbus_utility.hpp +@@ -31,6 +31,7 @@ + #include <utility> + #include <variant> + #include <vector> ++#include <list> + + // IWYU pragma: no_include <stddef.h> + // IWYU pragma: no_include <stdint.h> +@@ -63,6 +64,7 @@ using DbusVariantType = std::variant< + sdbusplus::message::object_path, + std::tuple<uint64_t, std::vector<std::tuple<std::string, std::string, double, uint64_t>>>, + std::tuple<uint64_t, std::vector<std::tuple<std::string, double, uint64_t>>>, ++ std::tuple<uint64_t, std::list<std::tuple<std::string, double, uint64_t>>>, + std::vector<std::tuple<std::string, std::string>>, + std::vector<std::tuple<uint32_t, std::vector<uint32_t>>>, + std::vector<std::tuple<uint32_t, size_t>>, +diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp +index 64808a9c..68500902 100644 +--- a/redfish-core/lib/metric_report.hpp ++++ b/redfish-core/lib/metric_report.hpp +@@ -34,7 +34,7 @@ constexpr const char* metricReportUri = + "/redfish/v1/TelemetryService/MetricReports"; + + using Readings = +- std::vector<std::tuple<std::string, double, uint64_t>>; ++ std::list<std::tuple<std::string, double, uint64_t>>; + using TimestampReadings = std::tuple<uint64_t, Readings>; + + inline std::string GetCroppedTimeStamp(uint64_t timestamp) diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend index 03ca8f77fb..8545f49ba3 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -9,6 +9,7 @@ SRC_URI += "\ file://0010-Add-smtp-client.patch \ file://0011-configure-telemetry.patch \ file://0012-add-telemetry-hour-data.patch \ + file://0013-bugfix-telemetry-circular-buffer.patch \ " #SRC_URI += "\ |