diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch deleted file mode 100644 index 67a2dc46f1..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-metrics-change-the-constant-used-for-invalid-timesta.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 3570b3e9ba367f10718b56336ce32d5254f66575 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Thu, 9 May 2019 13:00:37 +0200 -Subject: [PATCH] metrics: change the constant used for invalid timestamps - -Use (uint64_t)-1 rather than 0 to indicate an invalid timestamp. It -should not be possible for the kernel to return 0 from -clock_gettime(), but we have received some reports of our asserts -triggering, so avoid the issue entirely by using -1 instead (which -really can never be returned). - -See https://retrace.fedoraproject.org/faf/reports/2539484/ - -Signed-off-by: Tom Gundersen <teg@jklm.no> -Upstream-Status: dbus-broker@3570b3e9ba367f10718b56336ce32d5254f66575 ---- - src/util/metrics.c | 8 ++++---- - src/util/metrics.h | 9 ++++++--- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/util/metrics.c b/src/util/metrics.c -index b5a7182..eef94eb 100644 ---- a/src/util/metrics.c -+++ b/src/util/metrics.c -@@ -26,7 +26,7 @@ void metrics_init(Metrics *metrics, clockid_t id) { - } - - void metrics_deinit(Metrics *metrics) { -- c_assert(!metrics->timestamp); -+ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); - metrics_init(metrics, metrics->id); - } - -@@ -82,7 +82,7 @@ void metrics_sample_add(Metrics *metrics, uint64_t timestamp) { - * a sample is not currently running. - */ - void metrics_sample_start(Metrics *metrics) { -- c_assert(!metrics->timestamp); -+ c_assert(metrics->timestamp == METRICS_TIMESTAMP_INVALID); - metrics->timestamp = metrics_get_time(metrics); - } - -@@ -93,11 +93,11 @@ void metrics_sample_start(Metrics *metrics) { - * End a currently running sample, and update the internal state. - */ - void metrics_sample_end(Metrics *metrics) { -- c_assert(metrics->timestamp); -+ c_assert(metrics->timestamp != METRICS_TIMESTAMP_INVALID); - - metrics_sample_add(metrics, metrics->timestamp); - -- metrics->timestamp = 0; -+ metrics->timestamp = METRICS_TIMESTAMP_INVALID; - } - - /** -diff --git a/src/util/metrics.h b/src/util/metrics.h -index a8ee915..b00dee6 100644 ---- a/src/util/metrics.h -+++ b/src/util/metrics.h -@@ -8,6 +8,8 @@ - #include <stdlib.h> - #include <time.h> - -+#define METRICS_TIMESTAMP_INVALID ((uint64_t) -1) -+ - typedef struct Metrics Metrics; - - struct Metrics { -@@ -23,9 +25,10 @@ struct Metrics { - uint64_t sum_of_squares; - }; - --#define METRICS_INIT(_id) { \ -- .minimum = (uint64_t) -1, \ -- .id = (_id), \ -+#define METRICS_INIT(_id) { \ -+ .minimum = (uint64_t) -1, \ -+ .id = (_id), \ -+ .timestamp = METRICS_TIMESTAMP_INVALID, \ - } - - void metrics_init(Metrics *metrics, clockid_t id); --- -2.21.0 - |