aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE2
-rw-r--r--Makefile2
-rw-r--r--NEWS4
-rw-r--r--README.md49
-rw-r--r--lz4.h2
-rw-r--r--lz4hc.h2
-rw-r--r--programs/bench.c2
-rw-r--r--programs/bench.h2
-rw-r--r--programs/fullbench.c8
-rw-r--r--programs/lz4cli.c6
-rw-r--r--programs/lz4io.c2
-rw-r--r--programs/lz4io.h2
12 files changed, 68 insertions, 15 deletions
diff --git a/LICENSE b/LICENSE
index 04403e4a..b566df30 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
LZ4 Library
-Copyright (c) 2013, Yann Collet
+Copyright (c) 2011-2014, Yann Collet
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
diff --git a/Makefile b/Makefile
index 4ceacb97..f71cdd1e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@
# - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
# ################################################################
-export RELEASE=r116
+export RELEASE=r117
LIBVER_MAJOR=1
LIBVER_MINOR=0
LIBVER_PATCH=0
diff --git a/NEWS b/NEWS
index 39a19f97..eb724733 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+r117:
+fix : block-dependency command line (issue 127)
+fix : lz4fullbench (issue 128)
+
r116:
hotfix (issue 124 & 125)
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..98ba7c61
--- /dev/null
+++ b/README.md
@@ -0,0 +1,49 @@
+LZ4 - Extremely fast compression
+================================
+
+LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems.
+A high compression derivative, called LZ4_HC, is also provided. It trades CPU time for compression ratio.
+
+This is an official mirror of LZ4 project, [hosted on Google Code](http://code.google.com/p/lz4/).
+The intention is to offer github's capabilities to lz4 users, such as cloning, branch, or source download.
+
+The "master" branch will reflect, the status of lz4 at its official homepage. Other branches will also exist, typically to fix some open issues or new requirements, and be available for testing before merge into master.
+
+
+Benchmarks
+-------------------------
+
+The benchmark uses the [Open-Source Benchmark program by m^2 (v0.14.2)](http://encode.ru/threads/1371-Filesystem-benchmark?p=33548&viewfull=1#post33548) compiled with GCC v4.6.1 on Linux Ubuntu 64-bits v11.10,
+The reference system uses a Core i5-3340M @2.7GHz.
+Benchmark evaluates the compression of reference [Silesia Corpus](http://sun.aei.polsl.pl/~sdeor/index.php?page=silesia) in single-thread mode.
+
+<table>
+ <tr>
+ <th>Compressor</th><th>Ratio</th><th>Compression</th><th>Decompression</th>
+ </tr>
+ <tr>
+ <th>LZ4 (r101)</th><th>2.084</th><th>422 MB/s</th><th>1820 MB/s</th>
+ </tr>
+ <tr>
+ <th>LZO 2.06</th><th>2.106</th><th>414 MB/s</th><th>600 MB/s</th>
+ </tr>
+ <tr>
+ <th>QuickLZ 1.5.1b6</th><th>2.237</th><th>373 MB/s</th><th>420 MB/s</th>
+ </tr>
+ <tr>
+ <th>Snappy 1.1.0</th><th>2.091</th><th>323 MB/s</th><th>1070 MB/s</th>
+ </tr>
+ <tr>
+ <th>LZF</th><th>2.077</th><th>270 MB/s</th><th>570 MB/s</th>
+ </tr>
+ <tr>
+ <th>zlib 1.2.8 -1</th><th>2.730</th><th>65 MB/s</th><th>280 MB/s</th>
+ </tr>
+ <tr>
+ <th>LZ4 HC (r101)</th><th>2.720</th><th>25 MB/s</th><th>2080 MB/s</th>
+ </tr>
+ <tr>
+ <th>zlib 1.2.8 -6</th><th>3.099</th><th>21 MB/s</th><th>300 MB/s</th>
+ </tr>
+</table>
+
diff --git a/lz4.h b/lz4.h
index 4b8a15b1..3bf0a487 100644
--- a/lz4.h
+++ b/lz4.h
@@ -1,7 +1,7 @@
/*
LZ4 - Fast LZ compression algorithm
Header File
- Copyright (C) 2011-2013, Yann Collet.
+ Copyright (C) 2011-2014, 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
diff --git a/lz4hc.h b/lz4hc.h
index d3f81a8d..b8109785 100644
--- a/lz4hc.h
+++ b/lz4hc.h
@@ -1,7 +1,7 @@
/*
LZ4 HC - High Compression Mode of LZ4
Header File
- Copyright (C) 2011-2013, Yann Collet.
+ Copyright (C) 2011-2014, 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
diff --git a/programs/bench.c b/programs/bench.c
index 2eabf619..8d68098c 100644
--- a/programs/bench.c
+++ b/programs/bench.c
@@ -1,6 +1,6 @@
/*
bench.c - Demo program to benchmark open-source compression algorithm
- Copyright (C) Yann Collet 2012-2013
+ Copyright (C) Yann Collet 2012-2014
GPL v2 License
This program is free software; you can redistribute it and/or modify
diff --git a/programs/bench.h b/programs/bench.h
index ed801d47..a0b7ed29 100644
--- a/programs/bench.h
+++ b/programs/bench.h
@@ -1,6 +1,6 @@
/*
bench.h - Demo program to benchmark open-source compression algorithm
- Copyright (C) Yann Collet 2012-2013
+ Copyright (C) Yann Collet 2012-2014
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/programs/fullbench.c b/programs/fullbench.c
index 8e87019f..19d10ba1 100644
--- a/programs/fullbench.c
+++ b/programs/fullbench.c
@@ -1,6 +1,6 @@
/*
bench.c - Demo program to benchmark open-source compression algorithm
- Copyright (C) Yann Collet 2012-2013
+ Copyright (C) Yann Collet 2012-2014
GPL v2 License
This program is free software; you can redistribute it and/or modify
@@ -281,12 +281,12 @@ static inline int local_LZ4_compress_limitedOutput_continue(const char* in, char
static void* stateLZ4HC;
static inline int local_LZ4_compressHC_withStateHC(const char* in, char* out, int inSize)
{
- return LZ4_compress_withState(stateLZ4HC, in, out, inSize);
+ return LZ4_compressHC_withStateHC(stateLZ4HC, in, out, inSize);
}
static inline int local_LZ4_compressHC_limitedOutput_withStateHC(const char* in, char* out, int inSize)
{
- return LZ4_compress_limitedOutput_withState(stateLZ4HC, in, out, inSize, LZ4_compressBound(inSize));
+ return LZ4_compressHC_limitedOutput_withStateHC(stateLZ4HC, in, out, inSize, LZ4_compressBound(inSize));
}
static inline int local_LZ4_compressHC_limitedOutput(const char* in, char* out, int inSize)
@@ -627,7 +627,7 @@ int usage_advanced()
{
DISPLAY( "\nAdvanced options :\n");
DISPLAY( " -c# : test only compression function # [%c-%c]\n", MINCOMPRESSIONCHAR, MAXCOMPRESSIONCHAR);
- DISPLAY( " -d# : test only compression function # [%c-%c]\n", MINDECOMPRESSIONCHAR, MAXDECOMPRESSIONCHAR);
+ DISPLAY( " -d# : test only decompression function # [%c-%c]\n", MINDECOMPRESSIONCHAR, MAXDECOMPRESSIONCHAR);
DISPLAY( " -i# : iteration loops [1-9](default : %i)\n", NBLOOPS);
DISPLAY( " -B# : Block size [4-7](default : 7)\n");
//DISPLAY( " -BD : Block dependency (improve compression ratio)\n");
diff --git a/programs/lz4cli.c b/programs/lz4cli.c
index fc5bd810..934c2bb6 100644
--- a/programs/lz4cli.c
+++ b/programs/lz4cli.c
@@ -1,6 +1,6 @@
/*
LZ4cli.c - LZ4 Command Line Interface
- Copyright (C) Yann Collet 2011-2013
+ Copyright (C) Yann Collet 2011-2014
GPL v2 License
This program is free software; you can redistribute it and/or modify
@@ -407,11 +407,11 @@ int main(int argc, char** argv)
int B = argument[1] - '0';
int S = 1 << (8 + 2*B);
BMK_SetBlocksize(S);
- LZ4IO_setBlockSizeID(B);
+ blockSize = LZ4IO_setBlockSizeID(B);
argument++;
break;
}
- case 'D': LZ4IO_setBlockMode(independentBlocks); argument++; break;
+ case 'D': LZ4IO_setBlockMode(chainedBlocks); argument++; break;
case 'X': LZ4IO_setBlockChecksumMode(1); argument ++; break;
default : exitBlockProperties=1;
}
diff --git a/programs/lz4io.c b/programs/lz4io.c
index ae8b7764..05955cf4 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -1,6 +1,6 @@
/*
LZ4io.c - LZ4 File/Stream Interface
- Copyright (C) Yann Collet 2011-2013
+ Copyright (C) Yann Collet 2011-2014
GPL v2 License
This program is free software; you can redistribute it and/or modify
diff --git a/programs/lz4io.h b/programs/lz4io.h
index cb35ec0a..9c3b217d 100644
--- a/programs/lz4io.h
+++ b/programs/lz4io.h
@@ -1,6 +1,6 @@
/*
LZ4io.h - LZ4 File/Stream Interface
- Copyright (C) Yann Collet 2011-2013
+ Copyright (C) Yann Collet 2011-2014
GPL v2 License
This program is free software; you can redistribute it and/or modify
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 03:20:06 +0000