Merge branches 'sb/zen-master' and 'sb/zen-master' of ssh://arn-wd-l1704:2222/ue-foundation/zen into sb/zen-master

2 files changed, 25 insertions, 2 deletions

diff --git a/src/zencore/include/zencore/thread.h b/src/zencore/include/zencore/thread.h
index d9fb5c023..11ef01a35 100644
--- a/src/zencore/include/zencore/thread.h
+++ b/src/zencore/include/zencore/thread.h
@@ -233,8 +233,10 @@ SetAtomicMax(std::atomic_uint64_t& Max, uint64_t Value)
 	}
 }
 
-ZENCORE_API int	 GetCurrentThreadId();
-ZENCORE_API void Sleep(int ms);
+void		 LimitHardwareConcurrency(unsigned int);
+unsigned int GetHardwareConcurrency();
+int			 GetCurrentThreadId();
+void		 Sleep(int ms);
 
 void thread_forcelink();  // internal
 
diff --git a/src/zencore/thread.cpp b/src/zencore/thread.cpp
index abf282467..7bd21a229 100644
--- a/src/zencore/thread.cpp
+++ b/src/zencore/thread.cpp
@@ -45,6 +45,27 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen {
 
+static unsigned int LimitConcurrency = 0;
+
+void
+LimitHardwareConcurrency(unsigned int Limit)
+{
+	LimitConcurrency = Limit;
+}
+
+unsigned int
+GetHardwareConcurrency()
+{
+	static unsigned int SysLimit = std::thread::hardware_concurrency();
+
+	if (LimitConcurrency)
+	{
+		return Min(SysLimit, LimitConcurrency);
+	}
+
+	return SysLimit;
+}
+
 #if ZEN_PLATFORM_WINDOWS
 // The information on how to set the thread name comes from
 // a MSDN article: http://msdn2.microsoft.com/en-us/library/xcb2z8hs.aspx