diff options
| author |  mtklein <mtklein@chromium.org> | 2016-01-04 19:13:19 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-04 19:13:19 -0800 |
| commit | 279c7864090a7b96c34c3594e38ced35967c673f (patch) | |
| tree | 3ecd209f1ca5798f6b3d491f9bcd683609b8ca52 /tests/OncePtrTest.cpp | |
| parent | c4a0d73e9aebcb7d291aa3eb8d5b6926d9a0b77e (diff) | |
If we swap its arguments, SkTaskGroup::batch() _is_ sk_parallel_for.
Why have two names if we can get away with one?
This kills off sk_parallel_for_thread_count(), which was only used to avoid forcing a deadlock in OncePtrTest on multicore machines in singlethreaded mode... a really niche use case. Instead just don't explicitly force a race.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1552093002
Review URL: https://codereview.chromium.org/1552093002
Diffstat (limited to 'tests/OncePtrTest.cpp')
| -rw-r--r-- | tests/OncePtrTest.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/OncePtrTest.cpp b/tests/OncePtrTest.cpp index 103172751a..d01cee09fe 100644 --- a/tests/OncePtrTest.cpp +++ b/tests/OncePtrTest.cpp @@ -18,14 +18,7 @@ DEF_TEST(OncePtr, r) { return new int(5); }; - SkAtomic<int> force_a_race(sk_parallel_for_thread_count()); - if (force_a_race < 1) { - return; - } - sk_parallel_for(sk_num_cores()*4, [&](size_t) { - force_a_race.fetch_add(-1); - while (force_a_race.load() > 0); - + SkTaskGroup().batch(sk_num_cores()*4, [&](size_t) { int* n = once.get(create); REPORTER_ASSERT(r, *n == 5); }); @@ -39,7 +32,7 @@ DEF_TEST(OnceNoPtr, r) { static SkAtomic<int> calls(0); SkAtomic<int> force_a_race(sk_num_cores()); - sk_parallel_for(sk_num_cores()*4, [&](size_t) { + SkTaskGroup().batch(sk_num_cores()*4, [&](size_t) { force_a_race.fetch_add(-1); while (force_a_race.load() > 0); |