diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-10 10:51:01 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-10 10:55:23 -0500 |
commit | e0425f9493e25fa14f11505d9ebc12a2fe78d4b6 (patch) | |
tree | 484c45b269b18f3182d100b922d990d957f20bd0 | |
parent | 06f85d41d02ebef76487b230f35f2ec638c46c8b (diff) |
Globally disable threading for these for now.
It doesn't win us much performance-wise (as it turned out), and causes
weird crashers with large documents.
Change-Id: I0566ce850b8f6656e6f9821c653b7a825a7874a3
-rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xetable.cxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 64b48d3adfc5..2c9562b04c78 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -810,6 +810,8 @@ bool ZipPackageStream::saveChild( if (xSeek.is() && xSeek->getLength() < 100000) bParallelDeflate = false; + bParallelDeflate = false; // globally disable parallel deflate for now. + if (bParallelDeflate) { // Start a new thread deflating this zip entry diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 66df5d65a8e1..84fdaec2b157 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2069,6 +2069,7 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt // on its own data. size_t nRows = maRowMap.size(); size_t nThreads = std::max( std::thread::hardware_concurrency(), 1U ); + nThreads = 1; // globally disable multi-threading for now. if ( nThreads == 1 || nRows < 128 ) { RowMap::iterator itr, itrBeg = maRowMap.begin(), itrEnd = maRowMap.end(); |