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 /sc/source | |
| 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 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index bc6e48b4afef..f539b921d046 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2133,7 +2133,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt // This is staggeringly slow, and each element operates only // on its own data. const size_t nRows = maRowMap.size(); - const size_t nThreads = nRows < 128 ? 1 : std::max(std::thread::hardware_concurrency(), 1U); + const size_t nThreads = nRows < 128 ? 1 : comphelper::ThreadPool::getPreferredConcurrency(); #else const size_t nThreads = 1; // globally disable multi-threading for now. #endif diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 52b71406ee97..6e6e101f0c48 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -309,7 +309,7 @@ public: void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVector& rSheets ) { - sal_Int32 nThreads = std::min( rSheets.size(), (size_t) std::max(std::thread::hardware_concurrency(), 1U) ); + sal_Int32 nThreads = std::min( rSheets.size(), (size_t) comphelper::ThreadPool::getPreferredConcurrency() ); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); |