Merge pull request #185 from adamhathcock/ppmd_allocation_zipwriter

Make PpmdProperties lazy to avoid unnecessary allocations.
This commit is contained in:
Adam Hathcock
2016-10-03 13:04:14 +01:00
committed by GitHub
4 changed files with 25 additions and 11 deletions

View File

@@ -9,7 +9,7 @@ The major feature is support for non-seekable streams so large files can be proc
## Need Help?
Post Issues on Github!
Check the [Supported Formats](FORMATS.md) and [basic usage.](USAGE.md)
Check the [Supported Formats](FORMATS.md) and [Basic Usage.](USAGE.md)
## A Simple Request

View File

@@ -3,13 +3,6 @@ using SharpCompress.Converters;
namespace SharpCompress.Compressors.PPMd
{
public enum PpmdVersion
{
H,
H7z,
I1
}
public class PpmdProperties
{
public PpmdVersion Version = PpmdVersion.I1;

View File

@@ -0,0 +1,9 @@
namespace SharpCompress.Compressors.PPMd
{
public enum PpmdVersion
{
H,
H7z,
I1
}
}

View File

@@ -19,10 +19,10 @@ namespace SharpCompress.Writers.Zip
{
private readonly CompressionType compressionType;
private readonly CompressionLevel compressionLevel;
private readonly PpmdProperties ppmdProperties = new PpmdProperties(); // Caching properties to speed up PPMd
private readonly List<ZipCentralDirectoryEntry> entries = new List<ZipCentralDirectoryEntry>();
private readonly string zipComment;
private long streamPosition;
private PpmdProperties ppmdProps;
public ZipWriter(Stream destination, ZipWriterOptions zipWriterOptions)
: base(ArchiveType.Zip)
@@ -34,6 +34,18 @@ namespace SharpCompress.Writers.Zip
InitalizeStream(destination, !zipWriterOptions.LeaveStreamOpen);
}
private PpmdProperties PpmdProperties
{
get
{
if (ppmdProps == null)
{
ppmdProps = new PpmdProperties();
}
return ppmdProps;
}
}
protected override void Dispose(bool isDisposing)
{
if (isDisposing)
@@ -252,8 +264,8 @@ namespace SharpCompress.Writers.Zip
}
case ZipCompressionMethod.PPMd:
{
counting.Write(writer.ppmdProperties.Properties, 0, 2);
return new PpmdStream(writer.ppmdProperties, counting, true);
counting.Write(writer.PpmdProperties.Properties, 0, 2);
return new PpmdStream(writer.PpmdProperties, counting, true);
}
default:
{