From 37ddbd71ab9fe811a6e3207c9dc54c236c60f90e Mon Sep 17 00:00:00 2001 From: klzgrad Date: Fri, 7 Feb 2025 22:57:10 +0800 Subject: [PATCH] openwrt: base: Disable lock-free assert on ARMv6 --- src/base/metrics/persistent_sample_map.cc | 2 +- src/base/threading/thread_collision_warner.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/base/metrics/persistent_sample_map.cc b/src/base/metrics/persistent_sample_map.cc index bdf1fffea1..6d74b51142 100644 --- a/src/base/metrics/persistent_sample_map.cc +++ b/src/base/metrics/persistent_sample_map.cc @@ -42,7 +42,7 @@ struct SampleRecord { std::atomic count; // The count associated with the above value. // `count` may operate inter-process and so must be lock-free. - static_assert(std::atomic::is_always_lock_free); + // static_assert(std::atomic::is_always_lock_free); // For backwards compatibility, `std::atomic` and `Count` must have // the same memory layouts. If this ever changes, make sure to increment diff --git a/src/base/threading/thread_collision_warner.h b/src/base/threading/thread_collision_warner.h index ee3f53cf07..da77239184 100644 --- a/src/base/threading/thread_collision_warner.h +++ b/src/base/threading/thread_collision_warner.h @@ -225,7 +225,6 @@ class BASE_EXPORT ThreadCollisionWarner { // This stores the thread id that is inside the critical section, if the // value is 0 then no thread is inside. std::atomic valid_thread_id_; - static_assert(std::atomic::is_always_lock_free, ""); // Counter to trace how many time a critical section was "pinned" // (when allowed) in order to unpin it when counter_ reaches 0.