prepare release 2.1.0

Author: tnagler

cran-comments.md

@@ -6,13 +6,8 @@ also the problems on Fedora, which I could not reproduce.
 * macOS X (release)
 * Windows Server 2019 (release)
 * CRAN win builder (devel)
-* rhub::check_for_cran()
-* rhub::check_with_sanitizers()
-* rhub::check_with_valgrind()
 
 ## Check status summary
-                WARN NOTE OK
-Source packages    0    0  1
-Reverse depends    1   17  1
-
-The warning in package CDSeq is known and expected.
+                  NOTE OK
+  Source packages    0  1
+  Reverse depends   17  1

docs/xml/Rcerr_8hpp.xml

@@ -4,7 +4,6 @@
     <compoundname>Rcerr.hpp</compoundname>
     <includes local="no">ostream</includes>
     <includes refid="RMonitor_8hpp" local="yes">RcppThread/RMonitor.hpp</includes>
-    <includedby refid="ThreadPool_8hpp" local="yes">/data/dev/r/RcppThread/inst/include/RcppThread/ThreadPool.hpp</includedby>
     <includedby refid="Thread_8hpp" local="yes">/data/dev/r/RcppThread/inst/include/RcppThread/Thread.hpp</includedby>
     <includedby refid="RcppThread_8h" local="yes">/data/dev/r/RcppThread/inst/include/RcppThread.h</includedby>
     <incdepgraph>

docs/xml/ThreadPool_8hpp.xml

@@ -4,7 +4,6 @@
     <compoundname>ThreadPool.hpp</compoundname>
     <includes refid="RMonitor_8hpp" local="yes">RcppThread/RMonitor.hpp</includes>
     <includes refid="Rcout_8hpp" local="yes">RcppThread/Rcout.hpp</includes>
-    <includes refid="Rcerr_8hpp" local="yes">RcppThread/Rcerr.hpp</includes>
     <includes refid="quickpool_8hpp" local="yes">RcppThread/quickpool.hpp</includes>
     <includes local="no">atomic</includes>
     <includes local="no">condition_variable</includes>

inst/include/RcppThread/RMonitor.hpp

@@ -112,7 +112,7 @@ class RMonitor {
         if ( calledFromMainThread() && (msgsErr_.str() != std::string("")) ) {
             // release messages in buffer
             REprintf("%s", msgsErr_.str().c_str());
-            //R_FlushConsole();
+            // R_FlushConsole();
             // clear message buffer
             msgsErr_.str("");
         }

inst/include/RcppThread/ThreadPool.hpp

@@ -8,7 +8,7 @@
 
 #include "RcppThread/RMonitor.hpp"
 #include "RcppThread/Rcout.hpp"
-#include "RcppThread/Rcerr.hpp"
+// #include "RcppThread/Rcerr.hpp"
 #include "RcppThread/quickpool.hpp"
 
 #include <atomic>
@@ -233,12 +233,12 @@ ThreadPool::wait()
     do {
         pool_->wait(100);
         Rcout << "";
-        Rcerr << "";
+        // Rcerr << "";
         checkUserInterrupt();
 
     } while (!pool_->done());
     Rcout << "";
-    Rcerr << "";
+    // Rcerr << "";
 }
 
 //! waits for all jobs to finish.

inst/include/RcppThread/quickpool.hpp

@@ -748,14 +748,14 @@ class TaskManager
     std::exception_ptr err_ptr_{ nullptr };
 };
 
+#if (defined __linux__)
 // find out which cores are allowed for use by pthread
 inline std::vector<size_t>
 get_avail_cores()
 {
     auto ncores = std::thread::hardware_concurrency();
     std::vector<size_t> avail_cores;
     avail_cores.reserve(ncores);
-#if (defined __linux__)
     cpu_set_t cpuset;
     int rc = pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
     if (rc != 0) {
@@ -766,9 +766,9 @@ get_avail_cores()
             avail_cores.push_back(id);
         }
     }
-#endif
     return avail_cores;
 }
+#endif
 
 inline size_t
 num_cores_avail()
@@ -829,6 +829,8 @@ class ThreadPool
         if (!task_manager_.called_from_owner_thread())
             return;
 
+        active_threads_ = threads;
+
         if (threads <= workers_.size()) {
             task_manager_.resize(threads);
         } else {
@@ -845,7 +847,6 @@ class ThreadPool
             set_thread_affinity();
 #endif
         }
-        active_threads_ = threads;
     }
 
     //! @brief retrieves the number of active worker threads in the thread pool.
@@ -970,7 +971,7 @@ class ThreadPool
     {
         cpu_set_t cpuset;
         auto avail_cores = sched::get_avail_cores();
-        for (size_t id = 0; id < workers_.size(); id++) {
+        for (size_t id = 0; id < active_threads_; id++) {
             CPU_ZERO(&cpuset);
             CPU_SET(avail_cores[id % avail_cores.size()], &cpuset);
             int rc = pthread_setaffinity_np(

tests/tests.cpp

@@ -237,18 +237,18 @@ testThreadPoolSingleThreaded()
         x[i] = 2 * x[i];
     };
 
-    // for (size_t i = 0; i < x.size(); i++)
-    //     pool.push(dummy, i);
-    // pool.wait();
+    for (size_t i = 0; i < x.size(); i++)
+        pool.push(dummy, i);
+    pool.wait();
 
     pool.parallelFor(0, x.size(), dummy);
     pool.wait();
 
     size_t count_wrong = 0;
     for (size_t i = 0; i < x.size(); i++)
-        count_wrong += (x[i] != 2);
+        count_wrong += (x[i] != 4);
     if (count_wrong > 0)
-        Rcout << "push gives wrong result" << std::endl;
+        Rcout << "single threaded gives wrong result" << std::endl;
     pool.join();
 }