github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-16 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

plugin/zstd: simple functions

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10113 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-07-30 06:30:03 +00:00
parent b54282bdb6
commit 2d1901317a
6 changed files with 223 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

70
uppsrc/Core/Copying
View file

@ -19,4 +19,72 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------------------------
LZ4 - Fast LZ compression algorithm
Copyright (C) 2011-2015, Yann Collet.
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- LZ4 source repository : https://github.com/Cyan4973/lz4
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
------------------------------------------------------------------------------------------------
xxHash - Fast Hash algorithm
Copyright (C) 2012-2015, Yann Collet
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
You can contact the author at :
- xxHash source repository : https://github.com/Cyan4973/xxHash

24
uppsrc/plugin/lz4/lz4.h
View file

@ -111,20 +111,20 @@ public:
};
int64 LZ4Compress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
int64 LZ4Decompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String LZ4Compress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String LZ4Compress(const String& s, Gate2<int64, int64> progress = false);
String LZ4Decompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String LZ4Decompress(const String& s, Gate2<int64, int64> progress = false);
int64 LZ4Compress(Stream& out, Stream& in, Function<bool(int64, int64)> progress = false);
int64 LZ4Decompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress = false);
String LZ4Compress(const void *data, int64 len, Function<bool(int64, int64)> progress = false);
String LZ4Compress(const String& s, Function<bool(int64, int64)> progress = false);
String LZ4Decompress(const void *data, int64 len, Function<bool(int64, int64)> progress = false);
String LZ4Decompress(const String& s, Function<bool(int64, int64)> progress = false);
#ifdef _MULTITHREADED
int64 CoLZ4Compress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
int64 CoLZ4Decompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String CoLZ4Compress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String CoLZ4Compress(const String& s, Gate2<int64, int64> progress = false);
String CoLZ4Decompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String CoLZ4Decompress(const String& s, Gate2<int64, int64> progress = false);
int64 CoLZ4Compress(Stream& out, Stream& in, Function<bool(int64, int64)> progress = false);
int64 CoLZ4Decompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress = false);
String CoLZ4Compress(const void *data, int64 len, Function<bool(int64, int64)> progress = false);
String CoLZ4Compress(const String& s, Function<bool(int64, int64)> progress = false);
String CoLZ4Decompress(const void *data, int64 len, Function<bool(int64, int64)> progress = false);
String CoLZ4Decompress(const String& s, Function<bool(int64, int64)> progress = false);
#endif
bool IsLZ4(Stream& s);

41
uppsrc/plugin/lz4/util.cpp
View file

@ -2,110 +2,113 @@
namespace Upp {
static void sCopy(Stream& out, Stream& in, Gate2<int64, int64> progress)
void sCompressStreamCopy_(Stream& out, Stream& in, Function<bool(int64, int64)> progress, Stream& orig_in, int64 insz)
{
const int CHUNK = 16384;
const int CHUNK = 32678;
Buffer<byte> b(CHUNK);
while(!in.IsEof()) { // TODO: progress!!!
while(!in.IsEof()) {
if(progress(orig_in.GetPos(), insz))
break;
int n = in.Get(b, CHUNK);
out.Put(b, n);
}
progress(orig_in.GetPos(), insz);
}
static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool co)
static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, Function<bool(int64, int64)> progress, bool co)
{
LZ4CompressStream outs(out);
#ifdef _MULTITHREADED
if(co)
outs.Concurrent();
#endif
sCopy(outs, in, progress);
sCompressStreamCopy_(outs, in, progress, in, size);
outs.Close();
if(!out.IsError() && !outs.IsError())
return out.GetSize();
return -1;
}
static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool co)
static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, Function<bool(int64, int64)> progress, bool co)
{
LZ4DecompressStream ins(in);
#ifdef _MULTITHREADED
if(co)
ins.Concurrent();
#endif
sCopy(out, ins, progress);
sCompressStreamCopy_(out, ins, progress, in, size);
ins.Close();
if(!out.IsError() && !ins.IsError())
return out.GetSize();
return -1;
}
int64 LZ4Compress(Stream& out, Stream& in, Gate2<int64, int64> progress)
int64 LZ4Compress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sLZ4Compress(out, in, in.GetLeft(), progress, false);
}
int64 LZ4Decompress(Stream& out, Stream& in, Gate2<int64, int64> progress)
int64 LZ4Decompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sLZ4Decompress(out, in, in.GetLeft(), progress, false);
}
String LZ4Compress(const void *data, int64 len, Gate2<int64, int64> progress)
String LZ4Compress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return LZ4Compress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String LZ4Compress(const String& s, Gate2<int64, int64> progress)
String LZ4Compress(const String& s, Function<bool(int64, int64)> progress)
{
return LZ4Compress(~s, s.GetLength(), progress);
}
String LZ4Decompress(const void *data, int64 len, Gate2<int64, int64> progress)
String LZ4Decompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return LZ4Decompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String LZ4Decompress(const String& s, Gate2<int64, int64> progress)
String LZ4Decompress(const String& s, Function<bool(int64, int64)> progress)
{
return LZ4Decompress(~s, s.GetLength(), progress);
}
#ifdef _MULTITHREADED
int64 CoLZ4Compress(Stream& out, Stream& in, Gate2<int64, int64> progress)
int64 CoLZ4Compress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sLZ4Compress(out, in, in.GetLeft(), progress, true);
}
int64 CoLZ4Decompress(Stream& out, Stream& in, Gate2<int64, int64> progress)
int64 CoLZ4Decompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sLZ4Decompress(out, in, in.GetLeft(), progress, true);
}
String CoLZ4Compress(const void *data, int64 len, Gate2<int64, int64> progress)
String CoLZ4Compress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return CoLZ4Compress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String CoLZ4Compress(const String& s, Gate2<int64, int64> progress)
String CoLZ4Compress(const String& s, Function<bool(int64, int64)> progress)
{
return CoLZ4Compress(~s, s.GetLength(), progress);
}
String CoLZ4Decompress(const void *data, int64 len, Gate2<int64, int64> progress)
String CoLZ4Decompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return CoLZ4Decompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String CoLZ4Decompress(const String& s, Gate2<int64, int64> progress)
String CoLZ4Decompress(const String& s, Function<bool(int64, int64)> progress)
{
return CoLZ4Decompress(~s, s.GetLength(), progress);
}

107
uppsrc/plugin/zstd/Util.cpp Normal file
View file

@ -0,0 +1,107 @@
#include "zstd.h"
namespace Upp {
void sCompressStreamCopy_(Stream& out, Stream& in, Function<bool(int64, int64)> progress, Stream& orig_in, int64 insz);
static int64 sZstdCompress(Stream& out, Stream& in, int64 size, Function<bool(int64, int64)> progress, bool co)
{
ZstdCompressStream outs(out);
#ifdef _MULTITHREADED
if(co)
outs.Concurrent();
#endif
sCompressStreamCopy_(outs, in, progress, in, size);
outs.Close();
if(!out.IsError() && !outs.IsError())
return out.GetSize();
return -1;
}
static int64 sZstdDecompress(Stream& out, Stream& in, int64 size, Function<bool(int64, int64)> progress, bool co)
{
ZstdDecompressStream ins(in);
#ifdef _MULTITHREADED
if(co)
ins.Concurrent();
#endif
sCompressStreamCopy_(out, ins, progress, in, size);
ins.Close();
if(!out.IsError() && !ins.IsError())
return out.GetSize();
return -1;
}
int64 ZstdCompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sZstdCompress(out, in, in.GetLeft(), progress, false);
}
int64 ZstdDecompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sZstdDecompress(out, in, in.GetLeft(), progress, false);
}
String ZstdCompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return ZstdCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String ZstdCompress(const String& s, Function<bool(int64, int64)> progress)
{
return ZstdCompress(~s, s.GetLength(), progress);
}
String ZstdDecompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return ZstdDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String ZstdDecompress(const String& s, Function<bool(int64, int64)> progress)
{
return ZstdDecompress(~s, s.GetLength(), progress);
}
#ifdef _MULTITHREADED
int64 CoZstdCompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sZstdCompress(out, in, in.GetLeft(), progress, true);
}
int64 CoZstdDecompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress)
{
return sZstdDecompress(out, in, in.GetLeft(), progress, true);
}
String CoZstdCompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return CoZstdCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String CoZstdCompress(const String& s, Function<bool(int64, int64)> progress)
{
return CoZstdCompress(~s, s.GetLength(), progress);
}
String CoZstdDecompress(const void *data, int64 len, Function<bool(int64, int64)> progress)
{
StringStream out;
MemReadStream in(data, len);
return CoZstdDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String CoZstdDecompress(const String& s, Function<bool(int64, int64)> progress)
{
return CoZstdDecompress(~s, s.GetLength(), progress);
}
#endif
};

25
uppsrc/plugin/zstd/zstd.h
View file

@ -95,21 +95,20 @@ public:
~ZstdDecompressStream();
};
int64 ZstdCompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
int64 ZstdDecompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String ZstdCompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String ZstdCompress(const String& s, Gate2<int64, int64> progress = false);
String ZstdDecompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String ZstdDecompress(const String& s, Gate2<int64, int64> progress = false);
int64 ZstdCompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress);
int64 ZstdDecompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress);
String ZstdCompress(const void *data, int64 len, Function<bool(int64, int64)> progress);
String ZstdCompress(const String& s, Function<bool(int64, int64)> progress);
String ZstdDecompress(const void *data, int64 len, Function<bool(int64, int64)> progress);
String ZstdDecompress(const String& s, Function<bool(int64, int64)> progress);
#ifdef _MULTITHREADED
int64 CoZstdCompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
int64 CoZstdDecompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String CoZstdCompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String CoZstdCompress(const String& s, Gate2<int64, int64> progress = false);
String CoZstdDecompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String CoZstdDecompress(const String& s, Gate2<int64, int64> progress = false);
int64 CoZstdCompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress);
int64 CoZstdDecompress(Stream& out, Stream& in, Function<bool(int64, int64)> progress);
String CoZstdCompress(const void *data, int64 len, Function<bool(int64, int64)> progress);
String CoZstdCompress(const String& s, Function<bool(int64, int64)> progress);
String CoZstdDecompress(const void *data, int64 len, Function<bool(int64, int64)> progress);
String CoZstdDecompress(const String& s, Function<bool(int64, int64)> progress);
#endif
bool IsZstd(Stream& s);

1
uppsrc/plugin/zstd/zstd.upp
View file

@ -5,5 +5,6 @@ file
zstd.h,
Compress.cpp,
Decompress.cpp,
Util.cpp,
common\zstd.h;