diff options
author | Andy Hung <hunga@google.com> | 2024-03-13 18:07:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-13 18:07:35 +0000 |
commit | c71b866ae47a656e33d3370cd89b46141be47c19 (patch) | |
tree | 58a8124f8b890dcc316cd697da11d7d5c7843c55 | |
parent | 12d2cda57c0ad52a089fd87df5b51b919b42fe71 (diff) | |
parent | aead8b971fcfe6bdb30459501f9e605829f73b37 (diff) | |
download | media-c71b866ae47a656e33d3370cd89b46141be47c19.tar.gz |
Merge "audio mutex: Minor updates" into main
-rw-r--r-- | audio_utils/include/audio_utils/mutex.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/audio_utils/include/audio_utils/mutex.h b/audio_utils/include/audio_utils/mutex.h index ea846874..bd1183d9 100644 --- a/audio_utils/include/audio_utils/mutex.h +++ b/audio_utils/include/audio_utils/mutex.h @@ -397,7 +397,7 @@ public: template <typename T> class relaxed_atomic : private std::atomic<T> { public: - constexpr relaxed_atomic(T desired) : std::atomic<T>(desired) {} + constexpr relaxed_atomic(T desired = {}) : std::atomic<T>(desired) {} operator T() const { return std::atomic<T>::load(std::memory_order_relaxed); } T operator=(T desired) { std::atomic<T>::store(desired, std::memory_order_relaxed); return desired; @@ -446,8 +446,7 @@ template <typename T> class unordered_atomic { static_assert(std::atomic<T>::is_always_lock_free); public: - unordered_atomic() = default; - constexpr unordered_atomic(T desired) : t_(desired) {} + constexpr unordered_atomic(T desired = {}) : t_(desired) {} operator T() const { return t_; } T& operator=(T desired) { return t_ = desired; } @@ -1236,8 +1235,8 @@ public: , stat_{get_mutex_stat_array()[static_cast<size_t>(order)]} { LOG_ALWAYS_FATAL_IF(static_cast<size_t>(order) >= Attributes::order_size_, - "mutex order %u is equal to or greater than order limit:%zu", - order, Attributes::order_size_); + "mutex order %zu is equal to or greater than order limit:%zu", + static_cast<size_t>(order), Attributes::order_size_); if (!priority_inheritance) return; @@ -1260,7 +1259,8 @@ public: if (ret != 0) { ALOGW("%s, pthread_mutex_init returned %d", __func__, ret); } - ALOGV("%s: audio_mutex initialized: ret:%d order:%u", __func__, ret, order_); + ALOGV("%s: audio_mutex initialized: ret:%d order:%zu", + __func__, ret, static_cast<size_t>(order_)); } ~mutex_impl() { |