aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/ports/SkAtomics_std.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-02-09 14:13:44 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-09 14:13:44 -0800
commit01f797fcb0c7497d3d62af84516f489c83cd1634 (patch)
tree734008e1892c121cc446971649dc914724729d77 /include/ports/SkAtomics_std.h
parentd5d27d9b146731b871b1bcc6d6de36fba2d5ea44 (diff)
SkAtomics: add asserts for valid memory orders.
Diffstat (limited to 'include/ports/SkAtomics_std.h')
-rw-r--r--include/ports/SkAtomics_std.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/ports/SkAtomics_std.h b/include/ports/SkAtomics_std.h
index f1fb0e2053..e89d74981c 100644
--- a/include/ports/SkAtomics_std.h
+++ b/include/ports/SkAtomics_std.h
@@ -7,18 +7,26 @@
template <typename T>
T sk_atomic_load(const T* ptr, sk_memory_order mo) {
+ SkASSERT(mo == sk_memory_order_relaxed ||
+ mo == sk_memory_order_seq_cst ||
+ mo == sk_memory_order_acquire ||
+ mo == sk_memory_order_consume);
const std::atomic<T>* ap = reinterpret_cast<const std::atomic<T>*>(ptr);
return std::atomic_load_explicit(ap, (std::memory_order)mo);
}
template <typename T>
void sk_atomic_store(T* ptr, T val, sk_memory_order mo) {
+ SkASSERT(mo == sk_memory_order_relaxed ||
+ mo == sk_memory_order_seq_cst ||
+ mo == sk_memory_order_release);
std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
return std::atomic_store_explicit(ap, val, (std::memory_order)mo);
}
template <typename T>
T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) {
+ // All values of mo are valid.
std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
return std::atomic_fetch_add_explicit(ap, val, (std::memory_order)mo);
}
@@ -27,6 +35,12 @@ template <typename T>
bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired,
sk_memory_order success,
sk_memory_order failure) {
+ // All values of success are valid.
+ SkASSERT(failure == sk_memory_order_relaxed ||
+ failure == sk_memory_order_seq_cst ||
+ failure == sk_memory_order_acquire ||
+ failure == sk_memory_order_consume);
+ SkASSERT(failure <= success);
std::atomic<T>* ap = reinterpret_cast<std::atomic<T>*>(ptr);
return std::atomic_compare_exchange_strong_explicit(ap, expected, desired,
(std::memory_order)success,