Merge remote-tracking branch 'upstream/master'

1 files changed, 23 insertions, 0 deletions

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 2337f5766..a53a9be52 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -422,4 +422,27 @@ std::string get_nix_version_display_string()
     umask(mode);
 #endif
   }
+
+  namespace
+  {
+    boost::mutex max_concurrency_lock;
+    unsigned max_concurrency = boost::thread::hardware_concurrency();
+  }
+
+  void set_max_concurrency(unsigned n)
+  {
+    if (n < 1)
+      n = boost::thread::hardware_concurrency();
+    unsigned hwc = boost::thread::hardware_concurrency();
+    if (n > hwc)
+      n = hwc;
+    boost::lock_guard<boost::mutex> lock(max_concurrency_lock);
+    max_concurrency = n;
+  }
+
+  unsigned get_max_concurrency()
+  {
+    boost::lock_guard<boost::mutex> lock(max_concurrency_lock);
+    return max_concurrency;
+  }
 }