Change SkTaskGroup to use std::function.

src/core/SkTaskGroup.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTaskGroup_DEFINED
 #define SkTaskGroup_DEFINED
 
+#include <functional>
+
 #include "SkTypes.h"
 #include "SkAtomics.h"
 #include "SkTemplates.h"
 
 struct SkRunnable;
 
 class SkTaskGroup : SkNoncopyable {
 public:
     // Create one of these in main() to enable SkTaskGroups globally.
     struct Enabler : SkNoncopyable {
         explicit Enabler(int threads = -1);  // Default is system-reported core count.
         ~Enabler();
     };
 
     SkTaskGroup();
     ~SkTaskGroup() { this->wait(); }
 
     // Add a task to this SkTaskGroup.  It will likely run on another thread.
     // Neither add() method takes owership of any of its parameters.
     void add(SkRunnable*);
 
-    template <typename T>
-    void add(void (*fn)(T*), T* arg) { this->add((void_fn)fn, (void*)arg); }
+    void add(std::function<void(void)> fn);
 
     // Add a batch of N tasks, all calling fn with different arguments.
     // Equivalent to a loop over add(fn, arg), but with perhaps less synchronization overhead.

[mtklein, 2015/12/10 20:58:35]

Might just remove this second line now?

[herb_g, 2015/12/10 21:58:36]

Done

-    template <typename T>
-    void batch(void (*fn)(T*), T* args, int N) { this->batch((void_fn)fn, args, N, sizeof(T)); }
+    void batch(std::function<void(int)> fn, int N);
 
     // Block until all Tasks previously add()ed to this SkTaskGroup have run.
     // You may safely reuse this SkTaskGroup after wait() returns.
     void wait();
 
 private:
-    typedef void(*void_fn)(void*);
-
-    void add  (void_fn, void* arg);
-    void batch(void_fn, void* args, int N, size_t stride);
-
     SkAtomic<int32_t> fPending;
 };
 
 // Returns best estimate of number of CPU cores available to use.
 int sk_num_cores();
 
 int sk_parallel_for_thread_count();
 
 // Call f(i) for i in [0, end).
 template <typename Func>
@@ skipping 14 matching lines @@
 #if defined(GOOGLE3)
     // Stack frame size is limited in GOOGLE3.
     SkAutoSTMalloc<512, Chunk> chunks(nchunks);
 #else
     // With the chunking strategy above this won't malloc until we have a machine with >512 cores.
     SkAutoSTMalloc<1024, Chunk> chunks(nchunks);
 #endif
 
     for (int i = 0; i < nchunks; i++) {
         Chunk& c = chunks[i];
-        c.f     = &f;
-        c.start = i * stride;
-        c.end   = SkTMin(c.start + stride, end);
+        c.f      = &f;
+        c.start  = i * stride;
+        c.end    = SkTMin(c.start + stride, end);
         SkASSERT(c.start < c.end);  // Nothing will break if start >= end, but it's a wasted chunk.
     }
 
-    void(*run_chunk)(Chunk*) = [](Chunk* c) {
-        for (int i = c->start; i < c->end; i++) {
-            (*c->f)(i);
+    Chunk* chunkBase = chunks.get();
+    auto run_chunk = [chunkBase](int i) {
+        Chunk& c = chunkBase[i];
+        for (int i = c.start; i < c.end; i++) {
+            (*c.f)(i);
         }
     };
-    SkTaskGroup().batch(run_chunk, chunks.get(), nchunks);
+    SkTaskGroup().batch(run_chunk, nchunks);
 }
 
 #endif//SkTaskGroup_DEFINED