diff options
| author |  herb <herb@google.com> | 2015-09-15 15:15:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-15 15:15:41 -0700 |
| commit | cd7f03597475ea423aa819bdae03996b26874dd5 (patch) | |
| tree | dd53ad22692e423802af93ab00dac1e48c117372 /include/ports | |
| parent | 013e9e3bb0495ab0b5aff011429a6ac983464d34 (diff) | |
Revert of Parallel cache - preliminary (patchset #24 id:460001 of https://codereview.chromium.org/1264103003/ )
Reason for revert:
Breaks DrMemory in the chrome roll.
Original issue's description:
> Parallel cache.
>
> TBR=reed@google.com
>
> BUG=skia:1330,528560
>
> Committed: https://skia.googlesource.com/skia/+/6f2a486040cb25465990196c229feb47e668e87f
>
> Committed: https://skia.googlesource.com/skia/+/bf2988833e5a36c6b430da6fdd2cfebd0015adec
>
> Committed: https://skia.googlesource.com/skia/+/014ffdb01ea5317614a1569efc30c50f06434222
TBR=reed@google.com,mtklein@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:1330,528560
Review URL: https://codereview.chromium.org/1345903002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkAtomics_atomic.h | 6 | ||||
| -rw-r--r-- | include/ports/SkAtomics_std.h | 7 | ||||
| -rw-r--r-- | include/ports/SkAtomics_sync.h | 5 |
3 files changed, 0 insertions, 18 deletions
diff --git a/include/ports/SkAtomics_atomic.h b/include/ports/SkAtomics_atomic.h index 64ee823f90..ddbf7c3f37 100644 --- a/include/ports/SkAtomics_atomic.h +++ b/include/ports/SkAtomics_atomic.h @@ -32,12 +32,6 @@ T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) { } template <typename T> -T sk_atomic_fetch_sub(T* ptr, T val, sk_memory_order mo) { - // All values of mo are valid. - return __atomic_fetch_sub(ptr, val, mo); -} - -template <typename T> bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, sk_memory_order success, sk_memory_order failure) { diff --git a/include/ports/SkAtomics_std.h b/include/ports/SkAtomics_std.h index 163efb78c0..4c26858dfd 100644 --- a/include/ports/SkAtomics_std.h +++ b/include/ports/SkAtomics_std.h @@ -39,13 +39,6 @@ T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) { } template <typename T> -T sk_atomic_fetch_sub(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_sub_explicit(ap, val, (std::memory_order)mo); -} - -template <typename T> bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, sk_memory_order success, sk_memory_order failure) { diff --git a/include/ports/SkAtomics_sync.h b/include/ports/SkAtomics_sync.h index 02b1e58072..7ca0b46a94 100644 --- a/include/ports/SkAtomics_sync.h +++ b/include/ports/SkAtomics_sync.h @@ -46,11 +46,6 @@ T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order) { } template <typename T> -T sk_atomic_fetch_sub(T* ptr, T val, sk_memory_order) { - return __sync_fetch_and_sub(ptr, val); -} - -template <typename T> bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, sk_memory_order, sk_memory_order) { T prev = __sync_val_compare_and_swap(ptr, *expected, desired); if (prev == *expected) { |