mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
43eca2d9f8d87363b5f4bf8c5df92bf06be08c08
libreoffice/package/inc/ZipOutputStream.hxx

77 lines
2.9 KiB
C++
Raw Normal View History

add modelines to .hxx files as well
2010-10-27 12:45:03 +01:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
re-base on ALv2 code.
2012-06-22 18:32:07 +01:00
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
fixincludeguards.sh: package Change-Id: Ia66d825baad3315c34bd579dc804f607bc6be30b
2014-04-18 22:14:30 +02:00
#ifndef INCLUDED_PACKAGE_INC_ZIPOUTPUTSTREAM_HXX
#define INCLUDED_PACKAGE_INC_ZIPOUTPUTSTREAM_HXX
Initial Revision :D
2000-11-13 12:38:03 +00:00
undo anything not wizard related in the previous merge-commit
2011-08-21 18:12:16 -05:00
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
Cleaned up the header files and inc directory
2001-04-19 13:11:06 +00:00
#include <ByteChucker.hxx>
package: Finally implement parallel zip entries deflating For that: 1, create ZipPackageStream::successfullyWritten to be called after the content is written 2, Do not take mutex when reading from WrapStreamForShare - threads should be using different streams anyway, but there is only one common mutex. :-/ Change-Id: I90303e49206b19454dd4141e24cc8be29c433045
2014-10-21 15:17:13 +02:00
#include <comphelper/threadpool.hxx>
Initial Revision :D
2000-11-13 12:38:03 +00:00
#94679# remove unncessary headers
2001-11-15 18:57:26 +00:00
#include <vector>
#89303# Use local ZipEntry struct
2001-09-14 13:47:23 +00:00
struct ZipEntry;
package: Finally implement parallel zip entries deflating For that: 1, create ZipPackageStream::successfullyWritten to be called after the content is written 2, Do not take mutex when reading from WrapStreamForShare - threads should be using different streams anyway, but there is only one common mutex. :-/ Change-Id: I90303e49206b19454dd4141e24cc8be29c433045
2014-10-21 15:17:13 +02:00
class ZipOutputEntry;
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
class ZipPackageStream;
undo anything not wizard related in the previous merge-commit
2011-08-21 18:12:16 -05:00
#86409# Support encryption in package files + a couple of optimisations
2001-04-27 13:56:07 +00:00
class ZipOutputStream
Initial Revision :D
2000-11-13 12:38:03 +00:00
{
package: ZipOutputStream: prefix members Change-Id: I9cc21ba87484560ec0db5424800dd67f80e00540
2014-10-07 14:44:53 +02:00
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xStream;
::std::vector < ZipEntry * > m_aZipList;
undo anything not wizard related in the previous merge-commit
2011-08-21 18:12:16 -05:00
package: ZipOutputStream: prefix members Change-Id: I9cc21ba87484560ec0db5424800dd67f80e00540
2014-10-07 14:44:53 +02:00
ByteChucker m_aChucker;
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
ZipEntry *m_pCurrentEntry;
package: Finally implement parallel zip entries deflating For that: 1, create ZipPackageStream::successfullyWritten to be called after the content is written 2, Do not take mutex when reading from WrapStreamForShare - threads should be using different streams anyway, but there is only one common mutex. :-/ Change-Id: I90303e49206b19454dd4141e24cc8be29c433045
2014-10-21 15:17:13 +02:00
comphelper::ThreadPool &m_rSharedThreadPool;
std::vector< ZipOutputEntry* > m_aEntries;
Initial Revision :D
2000-11-13 12:38:03 +00:00
public:
undo anything not wizard related in the previous merge-commit
2011-08-21 18:12:16 -05:00
ZipOutputStream(
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > &xOStream );
#94679# remove unncessary headers
2001-11-15 18:57:26 +00:00
~ZipOutputStream();
This rather enormous commit has the following features: 1. Fixed three different memory leaks, one of them quite serious 2. Considerably streamlined the ZipPackageBuffer class - large performance increase, also streamlined EntryInputClass in the same way... 3. Correctly saves embedded zip files as embedded zip files instead of directories 4. Supports the copying of raw streams instead of de-compressing/re- compressing unnecessarily. Marty
2000-12-13 16:00:47 +00:00
package: Finally implement parallel zip entries deflating For that: 1, create ZipPackageStream::successfullyWritten to be called after the content is written 2, Do not take mutex when reading from WrapStreamForShare - threads should be using different streams anyway, but there is only one common mutex. :-/ Change-Id: I90303e49206b19454dd4141e24cc8be29c433045
2014-10-21 15:17:13 +02:00
void addDeflatingThread( ZipOutputEntry *pEntry, comphelper::ThreadTask *pThreadTask );
package: Call writeLOC always after putNextEntry explicitly Preparation step to parallel deflating. Rename putNextEntry to setEntry and make it a static function. We need to call setEntry before starting thread but writeLOC after. Change-Id: I99a9ffa7dc4c18b47c621847b48bf8469bfb789a
2014-10-21 10:37:02 +02:00
void writeLOC( ZipEntry *pEntry, bool bEncrypt = false )
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
Simplify input parameters to just take the sequence Change-Id: Ic2538ca8b0f7261064e1dfbf3884dd452003c797
2014-10-27 14:26:54 +01:00
void rawWrite( const css::uno::Sequence< sal_Int8 >& rBuffer )
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
package: Call writeLOC always after putNextEntry explicitly Preparation step to parallel deflating. Rename putNextEntry to setEntry and make it a static function. We need to call setEntry before starting thread but writeLOC after. Change-Id: I99a9ffa7dc4c18b47c621847b48bf8469bfb789a
2014-10-21 10:37:02 +02:00
void rawCloseEntry( bool bEncrypt = false )
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
package: Add ZipOutputEntry to isolate deflating of streams. Preparation commit for deflating streams in parallel. We still use the same single XOutputStream (ByteChucker :-) for sequential writing but this can now be changed more easily. Change-Id: Idf26cc2187461660e31ac2e12c4708e761596fb2
2014-10-09 15:22:54 +02:00
void finish()
This rather enormous commit has the following features: 1. Fixed three different memory leaks, one of them quite serious 2. Considerably streamlined the ZipPackageBuffer class - large performance increase, also streamlined EntryInputClass in the same way... 3. Correctly saves embedded zip files as embedded zip files instead of directories 4. Supports the copying of raw streams instead of de-compressing/re- compressing unnecessarily. Marty
2000-12-13 16:00:47 +00:00
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
package: Create memory buffer only when we need it - if we use parallelism Otherwise write directly to the resulting zip file. Change-Id: I75097969f0cccf0b45da591c71221e5ae18668cb
2014-12-13 23:09:10 +01:00
css::uno::Reference< css::io::XOutputStream > getStream();
This rather enormous commit has the following features: 1. Fixed three different memory leaks, one of them quite serious 2. Considerably streamlined the ZipPackageBuffer class - large performance increase, also streamlined EntryInputClass in the same way... 3. Correctly saves embedded zip files as embedded zip files instead of directories 4. Supports the copying of raw streams instead of de-compressing/re- compressing unnecessarily. Marty
2000-12-13 16:00:47 +00:00
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
static sal_uInt32 getCurrentDosTime();
package: Call writeLOC always after putNextEntry explicitly Preparation step to parallel deflating. Rename putNextEntry to setEntry and make it a static function. We need to call setEntry before starting thread but writeLOC after. Change-Id: I99a9ffa7dc4c18b47c621847b48bf8469bfb789a
2014-10-21 10:37:02 +02:00
static void setEntry( ZipEntry *pEntry );
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
package: Add ZipOutputEntry to isolate deflating of streams. Preparation commit for deflating streams in parallel. We still use the same single XOutputStream (ByteChucker :-) for sequential writing but this can now be changed more easily. Change-Id: Idf26cc2187461660e31ac2e12c4708e761596fb2
2014-10-09 15:22:54 +02:00
private:
#80556# improved exception handling
2000-12-04 10:30:09 +00:00
void writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
#89303# Use local ZipEntry struct
2001-09-14 13:47:23 +00:00
void writeCEN( const ZipEntry &rEntry )
#80556# improved exception handling
2000-12-04 10:30:09 +00:00
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
package: Move most ZipOutputEntry's methods back to ZipOutputStream We want to use ZipOutputEntry only for deflating (and maybe rename it). ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 was not a good idea because the data still needs to be written sequentially anyway. Otherwise it's hard to get offset positions of individual entries right. Since this commit rawCloseEntry needs to be called always; also when we use write&closeEntry because we don't call writeEXT in closeEntry anymore. Need to rename and add comments later. Change-Id: I03bd48ca6e108e6253a77a137746165909ca3c3d
2014-10-20 21:13:50 +02:00
void writeEXT( const ZipEntry &rEntry )
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
Initial Revision :D
2000-11-13 12:38:03 +00:00
};
#endif
add modelines to .hxx files as well
2010-10-27 12:45:03 +01:00
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue Copy Permalink