Avoid hang in OncePtr test with --threads 1

tests/OncePtrTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
+#include "SkCommonFlags.h"
 #include "SkOncePtr.h"
 #include "SkTaskGroup.h"
 
 DEF_TEST(OncePtr, r) {
+    if (FLAGS_threads > 0 && FLAGS_threads < sk_num_cores()) {
+        return;
+    }
+
     SkOncePtr<int> once;
 
     static SkAtomic<int> calls(0);
     auto create = [&] {
         calls.fetch_add(1);
         return new int(5);
     };
 
     SkAtomic<int> force_a_race(sk_num_cores());

[mtklein, 2015/10/26 13:36:37]

Does this work correctly if we change the initial count from sk_num_cores() to
FLAGS_threads?

[herb_g, 2015/10/26 14:32:56]

I agree with Mike on this. I don't think the new guard above is not needed.

[Kimmo Kinnunen, 2015/10/27 06:44:41]

Sure..

 
     sk_parallel_for(sk_num_cores()*4, [&](size_t) {
         force_a_race.fetch_add(-1);
         while (force_a_race.load() > 0);
 
-        int* n = once.get(create);
+        SkAutoTDelete<int> n(once.get(create));

[mtklein, 2015/10/26 13:36:37]

Pretty sure ~SkOncePtr deletes the pointer and this is a double delete.

[Kimmo Kinnunen, 2015/10/27 06:44:41]

I see. I didn't think this through, sorry.

         REPORTER_ASSERT(r, *n == 5);
     });
     REPORTER_ASSERT(r, calls.load() == 1);
 }
 
 /* TODO(mtklein): next CL
 
 SK_DECLARE_STATIC_ONCE(once_noptr);
 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) {
         force_a_race.fetch_add(-1);
         while (force_a_race.load() > 0);
 
         SkOnce(&once_noptr, [&] { calls.fetch_add(1); });
     });
     REPORTER_ASSERT(r, calls.load() == 1);
 }
 */