diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-06-14 07:19:20 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2016-06-15 21:28:47 +0000 |
| commit | 60e75fb276778459f6055360646d879b8c615d83 (patch) | |
| tree | 332c124a2bff614b1483ab5549e56dbdd743d17a /package | |
| parent | b43b7a59ca24927c4f4bd90935b4f0075304abe7 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 3f3a47c2b9af..43a9b8567aa0 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -832,7 +832,7 @@ bool ZipPackageStream::saveChild( // cores and allow 4-times the amount for having the queue well filled. The // 2nd parameter is the time to wait between cleanups in 10th of a second. // Both values may be added to the configuration settings if needed. - static sal_Int32 nAllowedThreads(std::max(std::thread::hardware_concurrency(), 1U) * 4); + static sal_Int32 nAllowedThreads(comphelper::ThreadPool::getPreferredConcurrency() * 4); rZipOut.reduceScheduledThreadsToGivenNumberOrLess(nAllowedThreads, 1); // Start a new thread deflating this zip entry |