no more inline stack size control

Author: kevinushey

RcppParallel.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: f1ae2e5b-eb1d-4d93-9ae1-29e364a5eaa6
 
 RestoreWorkspace: No
 SaveWorkspace: No

inst/include/RcppParallel/Common.h

@@ -41,7 +41,6 @@ inline int resolveValue(const char* envvar,
 // to from the void* passed to the worker thread (required because
 // the tinythreads interface allows to pass only a void* to the
 // thread main rather than a generic type / template)
-
 struct Worker 
 {  
    // construct and destruct (delete virtually)
@@ -58,9 +57,22 @@ struct Worker
 };
 
 // Tag type used for disambiguating splitting constructors
-
 struct Split {};
 
+// Used for controlling the stack size for threads / tasks within a scope.
+class ThreadStackSizeControl
+{
+public:
+   ThreadStackSizeControl();
+   ~ThreadStackSizeControl();
+   
+private:
+   // COPYING: not copyable
+   ThreadStackSizeControl(const ThreadStackSizeControl&);
+   ThreadStackSizeControl& operator=(const ThreadStackSizeControl&);
+};
+
+
 } // namespace RcppParallel
 
 

inst/include/RcppParallel/TBB.h

@@ -13,8 +13,6 @@
 
 namespace RcppParallel {
 
-namespace {
-
 struct TBBWorker
 {
    explicit TBBWorker(Worker& worker) : worker_(worker) {}
@@ -184,46 +182,6 @@ class TBBArenaParallelReduceExecutor
    std::size_t grainSize_;
 };
 
-class ThreadStackSizeControl
-{
-public:
-   
-   ThreadStackSizeControl()
-      : control_(nullptr)
-   {
-      int stackSize = resolveValue("RCPP_PARALLEL_STACK_SIZE", 0, 0);
-      if (stackSize > 0)
-      {
-         control_ = new tbb::global_control(
-            tbb::global_control::thread_stack_size,
-            stackSize
-         );
-      }
-   }
-   
-   ~ThreadStackSizeControl()
-   {
-      if (control_ != nullptr)
-      {
-         delete control_;
-         control_ = nullptr;
-      }
-   }
-
-private:
-   
-   // COPYING: not copyable
-   ThreadStackSizeControl(const ThreadStackSizeControl&);
-   ThreadStackSizeControl& operator=(const ThreadStackSizeControl&);
-   
-   // private members
-   tbb::global_control* control_;
-   
-};
-   
-} // anonymous namespace
-
-
 inline void tbbParallelFor(std::size_t begin,
                            std::size_t end, 
                            Worker& worker,

src/tbb.cpp

@@ -0,0 +1,42 @@
+
+
+#include <RcppParallel/Common.h>
+
+#ifndef TBB_PREVIEW_GLOBAL_CONTROL
+# define TBB_PREVIEW_GLOBAL_CONTROL 1
+#endif
+
+#include <tbb/tbb.h>
+#include <tbb/global_control.h>
+#include <tbb/scalable_allocator.h>
+
+namespace RcppParallel {
+
+tbb::global_control* s_globalControl = nullptr;
+
+ThreadStackSizeControl::ThreadStackSizeControl()
+{
+#ifdef RCPP_PARALLEL_USE_TBB
+   int stackSize = resolveValue("RCPP_PARALLEL_STACK_SIZE", 0, 0);
+   if (stackSize > 0)
+   {
+      s_globalControl = new tbb::global_control(
+         tbb::global_control::thread_stack_size,
+         stackSize
+      );
+   }
+#endif
+}
+
+ThreadStackSizeControl::~ThreadStackSizeControl()
+{
+#ifdef RCPP_PARALLEL_USE_TBB
+   if (s_globalControl != nullptr)
+   {
+      delete s_globalControl;
+      s_globalControl = nullptr;
+   }
+#endif
+}
+
+} // end namespace RcppParallel