diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-03-16 15:14:13 +0100 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-03-22 08:56:08 +0000 |
| commit | 7e2ea27e5d56f5cf767a6718a0f5edc28e24af14 (patch) | |
| tree | 63673e8a3f21ef7438fdb46edfa627e4d1aa7050 /package/source/zipapi/ZipOutputEntry.cxx | |
| parent | 0f0cea28c75a6565c7803b54536d4a8720ead160 (diff) | |
tdf#93553 limit parallelism at zip save time to useful amount
At ODT export time writing and zipping comtained data packages is nicely
parallelized, but not limited to an upper bounds of threads to use.
Together with memory consumption this makes ressource usage and runtime
behaviour bad to crashing (mostly on 32bit).
I have now limited the processing dependent on the number of available
cores to get a good processing/ressource ratio. The result uses much less
memory, is faster and runs on 32bit systems.
Change-Id: I8bd516a9a0cefd644f5d7001214bc717f29770ab
Reviewed-on: https://gerrit.libreoffice.org/23305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'package/source/zipapi/ZipOutputEntry.cxx')
| -rw-r--r-- | package/source/zipapi/ZipOutputEntry.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index 47ecbb4622af..6f983d372bfd 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -55,8 +55,9 @@ ZipOutputEntry::ZipOutputEntry( , m_xOutStream(rxOutput) , m_pCurrentEntry(&rEntry) , m_nDigested(0) -, m_bEncryptCurrentEntry(bEncrypt) , m_pCurrentStream(pStream) +, m_bEncryptCurrentEntry(bEncrypt) +, m_bFinished(false) { assert(m_pCurrentEntry->nMethod == DEFLATED && "Use ZipPackageStream::rawWrite() for STORED entries"); assert(m_xOutStream.is()); @@ -77,8 +78,9 @@ ZipOutputEntry::ZipOutputEntry( , m_xContext(rxContext) , m_pCurrentEntry(&rEntry) , m_nDigested(0) -, m_bEncryptCurrentEntry(bEncrypt) , m_pCurrentStream(pStream) +, m_bEncryptCurrentEntry(bEncrypt) +, m_bFinished(false) { assert(m_pCurrentEntry->nMethod == DEFLATED && "Use ZipPackageStream::rawWrite() for STORED entries"); if (m_bEncryptCurrentEntry) |