OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "SkGraphics.h" | 8 #include "SkGraphics.h" |
9 #include "SkPaint.h" | 9 #include "SkPaint.h" |
10 #include "SkTLS.h" | 10 #include "SkTLS.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 | 49 |
50 for (i = 0; i < N; ++i) { | 50 for (i = 0; i < N; ++i) { |
51 delete threads[i]; | 51 delete threads[i]; |
52 } | 52 } |
53 } | 53 } |
54 | 54 |
55 static int32_t gCounter; | 55 static int32_t gCounter; |
56 | 56 |
57 static void* FakeCreateTLS() { | 57 static void* FakeCreateTLS() { |
58 sk_atomic_inc(&gCounter); | 58 sk_atomic_inc(&gCounter); |
59 return NULL; | 59 return nullptr; |
60 } | 60 } |
61 | 61 |
62 static void FakeDeleteTLS(void*) { | 62 static void FakeDeleteTLS(void*) { |
63 sk_atomic_dec(&gCounter); | 63 sk_atomic_dec(&gCounter); |
64 } | 64 } |
65 | 65 |
66 static void testTLSDestructor(void*) { | 66 static void testTLSDestructor(void*) { |
67 SkTLS::Get(FakeCreateTLS, FakeDeleteTLS); | 67 SkTLS::Get(FakeCreateTLS, FakeDeleteTLS); |
68 } | 68 } |
69 | 69 |
70 DEF_TEST(TLS, reporter) { | 70 DEF_TEST(TLS, reporter) { |
71 // TODO: Disabled for now to work around | 71 // TODO: Disabled for now to work around |
72 // http://code.google.com/p/skia/issues/detail?id=619 | 72 // http://code.google.com/p/skia/issues/detail?id=619 |
73 // ('flaky segfault in TLS test on Shuttle_Ubuntu12 buildbots') | 73 // ('flaky segfault in TLS test on Shuttle_Ubuntu12 buildbots') |
74 if( false ) test_threads(&thread_main); | 74 if( false ) test_threads(&thread_main); |
75 | 75 |
76 // Test to ensure that at thread destruction, TLS destructors | 76 // Test to ensure that at thread destruction, TLS destructors |
77 // have been called. | 77 // have been called. |
78 test_threads(&testTLSDestructor); | 78 test_threads(&testTLSDestructor); |
79 REPORTER_ASSERT(reporter, 0 == gCounter); | 79 REPORTER_ASSERT(reporter, 0 == gCounter); |
80 } | 80 } |
OLD | NEW |