From 60e75fb276778459f6055360646d879b8c615d83 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Tue, 14 Jun 2016 07:19:20 -0400 Subject: tdf#98955 hardware_concurrency not ideal for thread pools A new static member getPreferredConcurrency added to comphelper::ThreadPool to return a configurable max number of threads. By default the new function returns the hardware_concurrency value provided by std::thread. When MAX_CONCURRENCY envar is defined, the return value is limited to whatever is set there. Three call-sites that used std::thread::hardware_concurrency have been replaced with getPreferredConcurrency. Unittests added to cover the functionality of the new member. Unittests are capped to 4 threads. Change-Id: I3332e393a88a5ed436316fa712ed920a4b37f4af Reviewed-on: https://gerrit.libreoffice.org/26254 Tested-by: Jenkins Reviewed-by: Ashod Nakashian --- solenv/gbuild/CppunitTest.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'solenv') diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 5ab32cac3b3b..5532192fc2da 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -19,6 +19,9 @@ # CppunitTest class +# Cap the number of threads unittests use. +export MAX_CONCURRENCY=4 + gb_CppunitTest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3)) -- cgit