ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Namespace scope mbed:: added for CriticalSectionLock used in Atomic templates

pull/14753/head
Tymoteusz Bloch 2021-06-08 22:55:43 +02:00
parent 7c17693c06
commit 3a05db8d98
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/cxxsupport/mstd_atomic
View File

@ -186,7 +186,7 @@ struct AtomicBaseRaw {
T val; T val;
} ret; } ret;
{ {
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
memcpy(std::addressof(ret.val), const_cast<const T *>(std::addressof(data)), sizeof(T)); memcpy(std::addressof(ret.val), const_cast<const T *>(std::addressof(data)), sizeof(T));
} }
return std::move(ret.val); return std::move(ret.val);
@ -194,19 +194,19 @@ struct AtomicBaseRaw {
T load(memory_order order = memory_order_seq_cst) const noexcept T load(memory_order order = memory_order_seq_cst) const noexcept
{ {
MBED_CHECK_LOAD_ORDER(order); MBED_CHECK_LOAD_ORDER(order);
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
return data; return data;
} }
void store(T desired, memory_order order = memory_order_seq_cst) volatile noexcept void store(T desired, memory_order order = memory_order_seq_cst) volatile noexcept
{ {
MBED_CHECK_STORE_ORDER(order); MBED_CHECK_STORE_ORDER(order);
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T)); memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
} }
void store(T desired, memory_order order = memory_order_seq_cst) noexcept void store(T desired, memory_order order = memory_order_seq_cst) noexcept
{ {
MBED_CHECK_STORE_ORDER(order); MBED_CHECK_STORE_ORDER(order);
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
data = std::move(desired); // MoveAssignable data = std::move(desired); // MoveAssignable
} }
T exchange(T desired, memory_order = memory_order_seq_cst) volatile noexcept T exchange(T desired, memory_order = memory_order_seq_cst) volatile noexcept
@ -217,7 +217,7 @@ struct AtomicBaseRaw {
T val; T val;
} old; } old;
{ {
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
memcpy(std::addressof(old.val), const_cast<const T *>(std::addressof(data)), sizeof(T)); memcpy(std::addressof(old.val), const_cast<const T *>(std::addressof(data)), sizeof(T));
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T)); memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
} }
@ -225,7 +225,7 @@ struct AtomicBaseRaw {
} }
T exchange(T desired, memory_order = memory_order_seq_cst) noexcept T exchange(T desired, memory_order = memory_order_seq_cst) noexcept
{ {
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
T old = std::move(data); // MoveConstructible T old = std::move(data); // MoveConstructible
data = std::move(desired); // MoveAssignable data = std::move(desired); // MoveAssignable
return old; return old;
@ -233,7 +233,7 @@ struct AtomicBaseRaw {
bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) volatile noexcept bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) volatile noexcept
{ {
MBED_CHECK_CAS_ORDER(success, failure); MBED_CHECK_CAS_ORDER(success, failure);
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
if (memcmp(const_cast<const T *>(std::addressof(data)), std::addressof(expected), sizeof(T)) == 0) { if (memcmp(const_cast<const T *>(std::addressof(data)), std::addressof(expected), sizeof(T)) == 0) {
memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T)); memcpy(const_cast<T *>(std::addressof(data)), std::addressof(desired), sizeof(T));
return true; return true;
@ -245,7 +245,7 @@ struct AtomicBaseRaw {
bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) noexcept bool compare_exchange_strong(T &expected, T desired, memory_order success, memory_order failure) noexcept
{ {
MBED_CHECK_CAS_ORDER(success, failure); MBED_CHECK_CAS_ORDER(success, failure);
CriticalSectionLock lock; mbed::CriticalSectionLock lock;
if (memcmp(std::addressof(data), std::addressof(expected), sizeof(T)) == 0) { if (memcmp(std::addressof(data), std::addressof(expected), sizeof(T)) == 0) {
data = std::move(desired); // MoveAssignable data = std::move(desired); // MoveAssignable
return true; return true;