Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: tests/OncePtrTest.cpp

Issue 1419593004: Avoid hang in OncePtr test with --threads 1 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkTaskGroup.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_num_cores()); 21 SkAtomic<int> force_a_race(sk_parallel_for_thread_count());
22 22 if (force_a_race < 1) {
23 return;
24 }
23 sk_parallel_for(sk_num_cores()*4, [&](size_t) { 25 sk_parallel_for(sk_num_cores()*4, [&](size_t) {
24 force_a_race.fetch_add(-1); 26 force_a_race.fetch_add(-1);
25 while (force_a_race.load() > 0); 27 while (force_a_race.load() > 0);
26 28
27 int* n = once.get(create); 29 int* n = once.get(create);
28 REPORTER_ASSERT(r, *n == 5); 30 REPORTER_ASSERT(r, *n == 5);
29 }); 31 });
30 REPORTER_ASSERT(r, calls.load() == 1); 32 REPORTER_ASSERT(r, calls.load() == 1);
31 } 33 }
32 34
33 /* TODO(mtklein): next CL 35 /* TODO(mtklein): next CL
34 36
35 SK_DECLARE_STATIC_ONCE(once_noptr); 37 SK_DECLARE_STATIC_ONCE(once_noptr);
36 DEF_TEST(OnceNoPtr, r) { 38 DEF_TEST(OnceNoPtr, r) {
37 static SkAtomic<int> calls(0); 39 static SkAtomic<int> calls(0);
38 40
39 SkAtomic<int> force_a_race(sk_num_cores()); 41 SkAtomic<int> force_a_race(sk_num_cores());
40 sk_parallel_for(sk_num_cores()*4, [&](size_t) { 42 sk_parallel_for(sk_num_cores()*4, [&](size_t) {
41 force_a_race.fetch_add(-1); 43 force_a_race.fetch_add(-1);
42 while (force_a_race.load() > 0); 44 while (force_a_race.load() > 0);
43 45
44 SkOnce(&once_noptr, [&] { calls.fetch_add(1); }); 46 SkOnce(&once_noptr, [&] { calls.fetch_add(1); });
45 }); 47 });
46 REPORTER_ASSERT(r, calls.load() == 1); 48 REPORTER_ASSERT(r, calls.load() == 1);
47 } 49 }
48 */ 50 */
OLDNEW
« no previous file with comments | « src/core/SkTaskGroup.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698