| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "Test.h" | 8 #include "Test.h" |
| 9 #include "SkOncePtr.h" | 9 #include "SkOncePtr.h" |
| 10 #include "SkTaskGroup.h" | 10 #include "SkTaskGroup.h" |
| 11 | 11 |
| 12 DEF_TEST(OncePtr, r) { | 12 DEF_TEST(OncePtr, r) { |
| 13 SkOncePtr<int> once; | 13 SkOncePtr<int> once; |
| 14 | 14 |
| 15 static SkAtomic<int> calls(0); | 15 static SkAtomic<int> calls(0); |
| 16 auto create = [&] { | 16 auto create = [&] { |
| 17 calls.fetch_add(1); | 17 calls.fetch_add(1); |
| 18 return new int(5); | 18 return new int(5); |
| 19 }; | 19 }; |
| 20 | 20 |
| 21 SkAtomic<int> force_a_race(sk_parallel_for_thread_count()); | 21 SkTaskGroup().batch(sk_num_cores()*4, [&](size_t) { |
| 22 if (force_a_race < 1) { | |
| 23 return; | |
| 24 } | |
| 25 sk_parallel_for(sk_num_cores()*4, [&](size_t) { | |
| 26 force_a_race.fetch_add(-1); | |
| 27 while (force_a_race.load() > 0); | |
| 28 | |
| 29 int* n = once.get(create); | 22 int* n = once.get(create); |
| 30 REPORTER_ASSERT(r, *n == 5); | 23 REPORTER_ASSERT(r, *n == 5); |
| 31 }); | 24 }); |
| 32 REPORTER_ASSERT(r, calls.load() == 1); | 25 REPORTER_ASSERT(r, calls.load() == 1); |
| 33 } | 26 } |
| 34 | 27 |
| 35 /* TODO(mtklein): next CL | 28 /* TODO(mtklein): next CL |
| 36 | 29 |
| 37 SK_DECLARE_STATIC_ONCE(once_noptr); | 30 SK_DECLARE_STATIC_ONCE(once_noptr); |
| 38 DEF_TEST(OnceNoPtr, r) { | 31 DEF_TEST(OnceNoPtr, r) { |
| 39 static SkAtomic<int> calls(0); | 32 static SkAtomic<int> calls(0); |
| 40 | 33 |
| 41 SkAtomic<int> force_a_race(sk_num_cores()); | 34 SkAtomic<int> force_a_race(sk_num_cores()); |
| 42 sk_parallel_for(sk_num_cores()*4, [&](size_t) { | 35 SkTaskGroup().batch(sk_num_cores()*4, [&](size_t) { |
| 43 force_a_race.fetch_add(-1); | 36 force_a_race.fetch_add(-1); |
| 44 while (force_a_race.load() > 0); | 37 while (force_a_race.load() > 0); |
| 45 | 38 |
| 46 SkOnce(&once_noptr, [&] { calls.fetch_add(1); }); | 39 SkOnce(&once_noptr, [&] { calls.fetch_add(1); }); |
| 47 }); | 40 }); |
| 48 REPORTER_ASSERT(r, calls.load() == 1); | 41 REPORTER_ASSERT(r, calls.load() == 1); |
| 49 } | 42 } |
| 50 */ | 43 */ |
| OLD | NEW |