--- /dev/null
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
#
# You can contact the author at :
# - LZ4 source repository : http://code.google.com/p/lz4/
+# - LZ4 forum froup : https://groups.google.com/forum/#!forum/lz4c
# ################################################################
# lz4 : Command Line Utility, supporting gzip-like arguments
# lz4c : CLU, supporting also legacy lz4demo arguments
# fullbench32: Same as fullbench, but forced to compile in 32-bits mode
# ################################################################
+RELEASE=r105
+PREFIX=/usr
+BINDIR=$(PREFIX)/bin
+MANDIR=$(PREFIX)/share/man/man1
+DISTNAME=lz4-$(RELEASE).tar.gz
CC=gcc
CFLAGS=-I. -std=c99 -Wall -W -Wundef -Wno-implicit-function-declaration
# Define *.exe as extension for Windows systems
-OS := $(shell uname)
-ifeq ($(OS),Linux)
-EXT =
-else
+# ifeq ($(OS),Windows_NT)
+ifneq (,$(filter Windows%,$(OS)))
EXT =.exe
+else
+EXT =
endif
-default: lz4c
+SOURCES = bench.c bench.h fullbench.c fuzzer.c lz4.1 lz4.c lz4cli.c \
+ lz4_format_description.txt lz4.h lz4hc.c lz4hc.h \
+ LZ4_Streaming_Format.odt Makefile xxhash.c xxhash.h \
+ NEWS COPYING \
+ cmake/CMakeLists.txt cmake/pack/release_COPYING.txt \
+ cmake/pack/CMakeLists.txt
+
+
+default: lz4 lz4c
all: lz4 lz4c lz4c32 fuzzer fuzzer32 fullbench fullbench32
lz4: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
$(CC) -O3 $(CFLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)
-lz4c: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
+lz4c : lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
$(CC) -O3 $(CFLAGS) $^ -o $@$(EXT)
lz4c32: lz4.c lz4hc.c bench.c xxhash.c lz4cli.c
$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
-fuzzer : lz4.c lz4hc.c fuzzer.c
+fuzzer : lz4.c lz4hc.c fuzzer.c
@echo fuzzer is a test tool to check lz4 integrity on target platform
$(CC) -O3 $(CFLAGS) $^ -o $@$(EXT)
-fuzzer32 : lz4.c lz4hc.c fuzzer.c
+fuzzer32: lz4.c lz4hc.c fuzzer.c
$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
-fullbench : lz4.c lz4hc.c xxhash.c fullbench.c
+fullbench : lz4.c lz4hc.c xxhash.c fullbench.c
$(CC) -O3 $(CFLAGS) $^ -o $@$(EXT)
-fullbench32 : lz4.c lz4hc.c xxhash.c fullbench.c
+fullbench32: lz4.c lz4hc.c xxhash.c fullbench.c
$(CC) -m32 -O3 $(CFLAGS) $^ -o $@$(EXT)
clean:
- rm -f core *.o lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) fuzzer$(EXT) fuzzer32$(EXT) fullbench$(EXT) fullbench32$(EXT)
+ @rm -f core *.o lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) \
+ fuzzer$(EXT) fuzzer32$(EXT) fullbench$(EXT) fullbench32$(EXT)
+ @echo Cleaning completed
+
+
+ifeq ($(shell uname),Linux)
+
+install: lz4
+ @install -d -m 755 $(BINDIR)/ $(MANDIR)/
+ @install -m 755 lz4 $(BINDIR)/lz4
+ @install -m 644 lz4.1 $(MANDIR)/lz4.1
+
+uninstall:
+ [ -x $(BINDIR)/lz4 ] && rm -f $(BINDIR)/lz4
+ [ -f $(MANDIR)/lz4.1 ] && rm -f $(MANDIR)/lz4.1
+
+dist: clean
+ @install -dD -m 700 lz4-$(RELEASE)/cmake/pack/
+ @for f in $(SOURCES); do \
+ install -m 600 $$f lz4-$(RELEASE)/$$f; \
+ done
+ @tar -czf $(DISTNAME) lz4-$(RELEASE)/
+ @rm -rf lz4-$(RELEASE)
+ @echo Distribution $(DISTNAME) built
+
+endif
--- /dev/null
+r105 :\r
+Makefile : New install script and man page, contributed by Prasad Pandit\r
+lz4cli.c : Minor modifications, for easier extensibility\r
+COPYING : added license file\r
+LZ4_Streaming_Format.odt : modified file name to remove white space characters\r
+exe : .exe suffix now properly added only for Windows target
\ No newline at end of file
#define NBLOOPS 3\r
#define TIMELOOP 2000\r
\r
-#define KNUTH 2654435761U\r
-#define MAX_MEM (1984<<20)\r
-#define DEFAULT_CHUNKSIZE (4<<20)\r
+#define KB *(1U<<10)\r
+#define MB *(1U<<20)\r
+#define GB *(1U<<30)\r
+\r
+#define KNUTH 2654435761U\r
+#define MAX_MEM (2 GB - 64 MB)\r
+#define DEFAULT_CHUNKSIZE (4 MB)\r
\r
\r
//**************************************\r
DISPLAY("- %i iterations -\n", nbIterations);\r
}\r
\r
-void BMK_SetPause()\r
-{\r
- BMK_pause = 1;\r
-}\r
+void BMK_SetPause() { BMK_pause = 1; }\r
\r
\r
//*********************************************************\r
\r
static size_t BMK_findMaxMem(U64 requiredMem)\r
{\r
- size_t step = (64U<<20); // 64 MB\r
+ size_t step = (64 MB);\r
BYTE* testmem=NULL;\r
\r
- requiredMem = (((requiredMem >> 25) + 1) << 26);\r
+ requiredMem = (((requiredMem >> 26) + 1) << 26);\r
if (requiredMem > MAX_MEM) requiredMem = MAX_MEM;\r
\r
requiredMem += 2*step;\r
int fileIdx=0;\r
char* orig_buff;\r
struct compressionParameters compP;\r
+ int cfunctionId;\r
\r
U64 totals = 0;\r
U64 totalz = 0;\r
\r
\r
// Init\r
- switch (cLevel)\r
+ if (cLevel <3) cfunctionId = 0; else cfunctionId = 1;\r
+ switch (cfunctionId)\r
{\r
#ifdef COMPRESSOR0\r
case 0 : compP.compressionFunction = COMPRESSOR0; break;\r
while(BMK_GetMilliSpan(milliTime) < TIMELOOP)\r
{\r
for (chunkNb=0; chunkNb<nbChunks; chunkNb++)\r
- //chunkP[chunkNb].origSize = LZ4_decompress_safe(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);\r
chunkP[chunkNb].compressedSize = LZ4_decompress_fast(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);\r
- //chunkP[chunkNb].compressedSize = LZ4_decompress_fast_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);\r
- //chunkP[chunkNb].origSize = LZ4_decompress_safe_withPrefix64k(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);\r
- //chunkP[chunkNb].origSize = LZ4_decompress_safe_partial(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize-5, chunkSize);\r
- //chunkP[chunkNb].compressedSize = LZ4_uncompress(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].origSize);\r
- //chunkP[chunkNb].origSize = LZ4_uncompress_unknownOutputSize(chunkP[chunkNb].compressedBuffer, chunkP[chunkNb].origBuffer, chunkP[chunkNb].compressedSize, chunkSize);\r
nbLoops++;\r
}\r
milliTime = BMK_GetMilliSpan(milliTime);\r
--- /dev/null
++\"\r
++\" lz4.1: This is a manual page for 'lz4' program. This file is part of the\r
++\" lz4 <https://code.google.com/p/lz4/> project.\r
++\"\r
++\r
++\" No hyphenation\r
++.hy 0\r
++.nr HY 0\r
+\r
+.TH lz4 man\r
+.SH NAME\r
+\fBlz4\fR - Extremely fast compression algorithm\r
+\r
+.SH SYNOPSIS\r
+.TP 5\r
+\fBlz4\fR [\fBOPTIONS\fR] [-|INPUT-FILE] <OUTPUT-FILE>\r
+\r
+.SH DESCRIPTION\r
+.PP\r
+\fBlz4\fR is an extremely fast lossless compression algorithm. It is based on\r
+the \fBLZ77\fR family of compression scheme. At the compression speed of 400\r
+MB/s per core, \fBlz4\fR is also scalable with multi-core CPUs. It features\r
+an extremely fast decoder, with speed in multiple GB/s per core, typically\r
+reaching the RAM speed limits on multi-core systems. \fBlz4\fR supports\r
+following options\r
+\r
+.SH OPTIONS\r
+.TP\r
+.B \-1\r
+ fast compression (default)\r
+.TP\r
+.B \-9\r
+ high compression\r
+.TP\r
+.B \-d\r
+ decompression\r
+.TP\r
+.B \-f\r
+ overwrite output without prompting\r
+.TP\r
+.B \-h/\-H\r
+ display help/long help and exit\r
+.TP\r
+.B \-V\r
+ display Version number and exit\r
+.TP\r
+.B \-v\r
+ verbose mode\r
+.TP\r
+.B \-q\r
+ suppress warnings; specify twice to suppress errors too\r
+.TP\r
+.B \-c\r
+ force write to standard output, even if it is the console\r
+.TP\r
+.B \-t\r
+ test compressed file integrity\r
+.TP\r
+.B \-z\r
+ force compression\r
+.TP\r
+.B \-B#\r
+ block size [4-7](default : 7)\r
+.TP\r
+.B \-BD\r
+ block dependency (improve compression ratio)\r
+.TP\r
+.B \-BX\r
+ enable block checksum (default:disabled)\r
+.TP\r
+.B \-Sx\r
+ disable stream checksum (default:enabled)\r
+.TP\r
+.B \-b\r
+ benchmark file(s)\r
+.TP\r
+.B \-i#\r
+ iteration loops [1-9](default : 3), benchmark mode only\r
+\r
+.SH BUGS\r
+Report bugs at:- https://code.google.com/p/lz4/\r
+\r
+.SH AUTHOR\r
+Yann Collet
\ No newline at end of file
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
\r
You can contact the author at :\r
- - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html\r
- LZ4 source repository : http://code.google.com/p/lz4/\r
+ - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c\r
*/\r
\r
//**************************************\r
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
\r
You can contact the author at :\r
- - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html\r
- LZ4 source repository : http://code.google.com/p/lz4/\r
+ - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c\r
*/\r
/*\r
Note : this is stand-alone program.\r
//****************************\r
#include <stdio.h> // fprintf, fopen, fread, _fileno, stdin, stdout\r
#include <stdlib.h> // malloc\r
-#include <string.h> // strcmp\r
+#include <string.h> // strcmp, strlen\r
#include <time.h> // clock\r
#include "lz4.h"\r
#include "lz4hc.h"\r
-#include "bench.h"\r
#include "xxhash.h"\r
+#include "bench.h"\r
\r
\r
//****************************\r
// Constants\r
//****************************\r
#define COMPRESSOR_NAME "LZ4 Compression CLI"\r
-#define COMPRESSOR_VERSION "1.0.4"\r
+#define COMPRESSOR_VERSION "v1.0.5"\r
#define COMPILED __DATE__\r
#define AUTHOR "Yann Collet"\r
-#define EXTENSION ".lz4"\r
-#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s (%s) ***\n", COMPRESSOR_NAME, COMPRESSOR_VERSION, (int)(sizeof(void*)*8), AUTHOR, COMPILED\r
+#define LZ4_EXTENSION ".lz4"\r
+#define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), COMPRESSOR_VERSION, AUTHOR, COMPILED\r
\r
#define KB *(1U<<10)\r
#define MB *(1U<<20)\r
#define _4BITS 0x0F\r
#define _8BITS 0xFF\r
\r
-#define MAGICNUMBER_SIZE 4\r
+#define MAGICNUMBER_SIZE 4\r
#define LZ4S_MAGICNUMBER 0x184D2204\r
#define LZ4S_SKIPPABLE0 0x184D2A50\r
#define LZ4S_SKIPPABLEMASK 0xFFFFFFF0\r
#define EXM_THROW(error, ...) \\r
{ \\r
DEBUGOUTPUT("Error defined at %s, line %i : \n", __FILE__, __LINE__); \\r
- DISPLAYLEVEL(1, "Error %i : ", error); \\r
- DISPLAYLEVEL(1, __VA_ARGS__); \\r
- DISPLAYLEVEL(1, "\n"); \\r
+ DISPLAYLEVEL(1, "Error %i : ", error); \\r
+ DISPLAYLEVEL(1, __VA_ARGS__); \\r
+ DISPLAYLEVEL(1, "\n"); \\r
exit(error); \\r
}\r
\r
\r
+//**************************************\r
+// Version modifiers\r
+//**************************************\r
+#define EXTENDED_ARGUMENTS\r
+#define EXTENDED_HELP\r
+#define EXTENDED_FORMAT\r
+#define DEFAULT_COMPRESSOR compress_file\r
+#define DEFAULT_DECOMPRESSOR decodeLZ4S\r
+\r
\r
//****************************\r
// Functions\r
DISPLAY( "Arguments :\n");\r
DISPLAY( " -1 : Fast compression (default) \n");\r
DISPLAY( " -9 : High compression \n");\r
- DISPLAY( " -d : decompression \n");\r
+ DISPLAY( " -d : decompression (default for %s extension)\n", LZ4_EXTENSION);\r
+ DISPLAY( " -z : force compression\n");\r
DISPLAY( " -f : overwrite output without prompting \n");\r
DISPLAY( " -h/-H : display help/long help and exit\n");\r
return 0;\r
DISPLAY( " -q : suppress warnings; specify twice to suppress errors too\n");\r
DISPLAY( " -c : force write to standard output, even if it is the console\n");\r
DISPLAY( " -t : test compressed file integrity\n");\r
- DISPLAY( " -z : force compression\n");\r
DISPLAY( " -B# : Block size [4-7](default : 7)\n");\r
DISPLAY( " -BD : Block dependency (improve compression ratio)\n");\r
DISPLAY( " -BX : enable block checksum (default:disabled)\n");\r
DISPLAY( " -y : overwrite output without prompting \n");\r
DISPLAY( " -s : suppress warnings \n");\r
#endif // DISABLE_LZ4C_LEGACY_OPTIONS\r
+ EXTENDED_HELP;\r
return 0;\r
}\r
\r
DISPLAY( "[output] can be left empty. In this case, it receives the following value : \n");\r
DISPLAY( " - if stdout is not the console, then [output] = stdout \n");\r
DISPLAY( " - if stdout is console : \n");\r
- DISPLAY( " + if compression selected, output to filename%s \n", EXTENSION);\r
- DISPLAY( " + if decompression selected, output to filename without '%s'\n", EXTENSION);\r
- DISPLAY( " > if input filename has no '%s' extension : error\n", EXTENSION);\r
+ DISPLAY( " + if compression selected, output to filename%s \n", LZ4_EXTENSION);\r
+ DISPLAY( " + if decompression selected, output to filename without '%s'\n", LZ4_EXTENSION);\r
+ DISPLAY( " > if input filename has no '%s' extension : error\n", LZ4_EXTENSION);\r
DISPLAY( "\n");\r
DISPLAY( "Compression levels : \n");\r
DISPLAY( "There are technically 2 accessible compression levels.\n");\r
\r
\r
// Init\r
- switch (compressionlevel)\r
- {\r
- case 0 : compressionFunction = LZ4_compress; break;\r
- case 1 : compressionFunction = LZ4_compressHC; break;\r
- default: compressionFunction = LZ4_compress;\r
- }\r
+ if (compressionlevel < 3) compressionFunction = LZ4_compress; else compressionFunction = LZ4_compressHC;\r
start = clock();\r
get_fileHandle(input_filename, output_filename, &finput, &foutput);\r
if ((displayLevel==2) && (compressionlevel==1)) displayLevel=3;\r
int inSize = (int) fread(in_buff, (size_t)1, (size_t)LEGACY_BLOCKSIZE, finput);\r
if( inSize<=0 ) break;\r
filesize += inSize;\r
- DISPLAYLEVEL(3, "Read : %i MB \r", (int)(filesize>>20));\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ", (int)(filesize>>20));\r
\r
// Compress Block\r
outSize = compressionFunction(in_buff, out_buff+4, inSize);\r
compressedfilesize += outSize+4;\r
- DISPLAYLEVEL(3, "Read : %i MB ==> %.2f%%\r", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ==> %.2f%% ", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
\r
// Write Block\r
* (unsigned int*) out_buff = LITTLE_ENDIAN_32(outSize);\r
\r
// Init\r
start = clock();\r
- if ((displayLevel==2) && (compressionlevel==1)) displayLevel=3;\r
- switch (compressionlevel)\r
+ if ((displayLevel==2) && (compressionlevel>=3)) displayLevel=3;\r
+ if (compressionlevel>=3)\r
{\r
- case 0 :\r
- initFunction = LZ4_create;\r
- compressionFunction = LZ4_compress_limitedOutput_continue;\r
- translateFunction = LZ4_slideInputBuffer;\r
- freeFunction = LZ4_free;\r
- break;\r
- case 1 :\r
- default:\r
initFunction = LZ4_createHC;\r
compressionFunction = LZ4_compressHC_limitedOutput_continue;\r
translateFunction = LZ4_slideInputBufferHC;\r
freeFunction = LZ4_freeHC;\r
}\r
+ else\r
+ {\r
+ initFunction = LZ4_create;\r
+ compressionFunction = LZ4_compress_limitedOutput_continue;\r
+ translateFunction = LZ4_slideInputBuffer;\r
+ freeFunction = LZ4_free;\r
+ }\r
get_fileHandle(input_filename, output_filename, &finput, &foutput);\r
blockSize = LZ4S_GetBlockSize_FromBlockId (blockSizeId);\r
\r
inSize = (unsigned int) fread(in_start, (size_t)1, (size_t)blockSize, finput);\r
if( inSize==0 ) break; // No more input : end of compression\r
filesize += inSize;\r
- DISPLAYLEVEL(3, "Read : %i MB \r", (int)(filesize>>20));\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ", (int)(filesize>>20));\r
if (streamChecksum) XXH32_update(streamChecksumState, in_start, inSize);\r
\r
// Compress Block\r
outSize = compressionFunction(ctx, in_start, out_buff+4, inSize, inSize-1);\r
if (outSize > 0) compressedfilesize += outSize+4; else compressedfilesize += inSize+4;\r
if (blockChecksum) compressedfilesize+=4;\r
- DISPLAYLEVEL(3, "Read : %i MB ==> %.2f%%\r", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ==> %.2f%% ", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
\r
// Write Block\r
if (outSize > 0)\r
\r
// Init\r
start = clock();\r
- if ((displayLevel==2) && (compressionlevel==1)) displayLevel=3;\r
- switch (compressionlevel)\r
- {\r
- case 0 : compressionFunction = LZ4_compress_limitedOutput; break;\r
- case 1 : compressionFunction = LZ4_compressHC_limitedOutput; break;\r
- default: compressionFunction = LZ4_compress_limitedOutput;\r
- }\r
+ if ((displayLevel==2) && (compressionlevel>=3)) displayLevel=3;\r
+ if (compressionlevel < 3) compressionFunction = LZ4_compress_limitedOutput; else compressionFunction = LZ4_compressHC_limitedOutput;\r
get_fileHandle(input_filename, output_filename, &finput, &foutput);\r
blockSize = LZ4S_GetBlockSize_FromBlockId (blockSizeId);\r
\r
unsigned int outSize;\r
\r
filesize += readSize;\r
- DISPLAYLEVEL(3, "Read : %i MB \r", (int)(filesize>>20));\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ", (int)(filesize>>20));\r
if (streamChecksum) XXH32_update(streamChecksumState, in_buff, (int)readSize);\r
\r
// Compress Block\r
outSize = compressionFunction(in_buff, out_buff+4, (int)readSize, (int)readSize-1);\r
if (outSize > 0) compressedfilesize += outSize+4; else compressedfilesize += readSize+4;\r
if (blockChecksum) compressedfilesize+=4;\r
- DISPLAYLEVEL(3, "Read : %i MB ==> %.2f%%\r", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
+ DISPLAYLEVEL(3, "\rRead : %i MB ==> %.2f%% ", (int)(filesize>>20), (double)compressedfilesize/filesize*100);\r
\r
// Write Block\r
if (outSize > 0)\r
// Main Loop\r
while (1)\r
{\r
- size_t uselessRet;\r
- int sinkint;\r
+ int decodeSize;\r
size_t sizeCheck;\r
\r
// Block Size\r
- uselessRet = fread(&blockSize, 1, 4, finput);\r
- if( uselessRet==0 ) break; // Nothing to read : file read is completed\r
+ sizeCheck = fread(&blockSize, 1, 4, finput);\r
+ if (sizeCheck==0) break; // Nothing to read : file read is completed\r
blockSize = LITTLE_ENDIAN_32(blockSize); // Convert to Little Endian\r
if (blockSize > LZ4_COMPRESSBOUND(LEGACY_BLOCKSIZE)) \r
{ // Cannot read next block : maybe new stream ?\r
}\r
\r
// Read Block\r
- uselessRet = fread(in_buff, 1, blockSize, finput);\r
+ sizeCheck = fread(in_buff, 1, blockSize, finput);\r
\r
// Decode Block\r
- sinkint = LZ4_decompress_safe(in_buff, out_buff, blockSize, LEGACY_BLOCKSIZE);\r
- if (sinkint < 0) EXM_THROW(52, "Decoding Failed ! Corrupted input detected !");\r
- filesize += sinkint;\r
+ decodeSize = LZ4_decompress_safe(in_buff, out_buff, blockSize, LEGACY_BLOCKSIZE);\r
+ if (decodeSize < 0) EXM_THROW(52, "Decoding Failed ! Corrupted input detected !");\r
+ filesize += decodeSize;\r
\r
// Write Block\r
- sizeCheck = fwrite(out_buff, 1, sinkint, foutput);\r
- if (sizeCheck != (size_t)sinkint) EXM_THROW(53, "Write error : cannot write decoded block into output\n");\r
+ sizeCheck = fwrite(out_buff, 1, decodeSize, foutput);\r
+ if (sizeCheck != (size_t)decodeSize) EXM_THROW(53, "Write error : cannot write decoded block into output\n");\r
}\r
\r
// Free\r
if (!blockIndependenceFlag)\r
{\r
out_start += decodedBytes;\r
- if (out_start + maxBlockSize > out_end) \r
+ if ((size_t)(out_end - out_start) < (size_t)maxBlockSize) \r
{\r
memcpy(out_buff, out_start - prefix64k, prefix64k); \r
out_start = out_buff + prefix64k; \r
switch(magicNumber)\r
{\r
case LZ4S_MAGICNUMBER:\r
- return decodeLZ4S(finput, foutput);\r
+ return DEFAULT_DECOMPRESSOR(finput, foutput);\r
case LEGACY_MAGICNUMBER:\r
DISPLAYLEVEL(4, "Detected : Legacy format \n");\r
return decodeLegacyStream(finput, foutput);\r
errorNb = fseek(finput, size, SEEK_CUR);\r
if (errorNb != 0) EXM_THROW(43, "Stream error : cannot skip skippable area");\r
return selectDecoder(finput, foutput);\r
+ EXTENDED_FORMAT;\r
default:\r
if (ftell(finput) == MAGICNUMBER_SIZE) EXM_THROW(44,"Unrecognized header : file cannot be decoded"); // Wrong magic number at the beginning of 1st stream\r
DISPLAYLEVEL(2, "Stream followed by unrecognized data\n");\r
\r
// Final Status\r
end = clock();\r
- DISPLAYLEVEL(2, "Successfully decoded %llu bytes \n", filesize);\r
+ DISPLAYLEVEL(2, "Successfully decoded %llu bytes \n", filesize);\r
{\r
double seconds = (double)(end - start)/CLOCKS_PER_SEC;\r
DISPLAYLEVEL(4, "Done in %.2f s ==> %.2f MB/s\n", seconds, (double)filesize / seconds / 1024 / 1024);\r
}\r
\r
\r
+void waitEnter()\r
+{\r
+ DISPLAY("Press enter to continue...\n");\r
+ getchar();\r
+}\r
+\r
+\r
int main(int argc, char** argv)\r
{\r
int i,\r
bench=0,\r
filenamesStart=2,\r
legacy_format=0,\r
- forceStdout=0;\r
+ forceStdout=0,\r
+ forceCompress=0,\r
+ pause=0;\r
char* input_filename=0;\r
char* output_filename=0;\r
char nullOutput[] = NULL_OUTPUT;\r
- char extension[] = EXTENSION;\r
+ char extension[] = LZ4_EXTENSION;\r
\r
// Init\r
programName = argv[0];\r
argument ++;\r
\r
#if !defined(DISABLE_LZ4C_LEGACY_OPTIONS)\r
- // Legacy options (-c0, -c1, -hc, -y, -s, -b0, -b1)\r
+ // Legacy options (-c0, -c1, -hc, -y, -s)\r
if ((argument[0]=='c') && (argument[1]=='0')) { cLevel=0; argument++; continue; } // -c0 (fast compression)\r
- if ((argument[0]=='c') && (argument[1]=='1')) { cLevel=1; argument++; continue; } // -c1 (high compression)\r
- if ((argument[0]=='h') && (argument[1]=='c')) { cLevel=1; argument++; continue; } // -hc (high compression)\r
+ if ((argument[0]=='c') && (argument[1]=='1')) { cLevel=9; argument++; continue; } // -c1 (high compression)\r
+ if ((argument[0]=='h') && (argument[1]=='c')) { cLevel=9; argument++; continue; } // -hc (high compression)\r
if (*argument=='y') { overwrite=1; continue; } // -y (answer 'yes' to overwrite permission)\r
if (*argument=='s') { displayLevel=1; continue; } // -s (silent mode)\r
- if ((argument[0]=='b') && (argument[1]=='0')) { bench=1; cLevel=0; argument++; continue; } // -b0 (fast bench)\r
- if ((argument[0]=='b') && (argument[1]=='1')) { bench=1; cLevel=1; argument++; continue; } // -b1 (HC bench)\r
#endif // DISABLE_LZ4C_LEGACY_OPTIONS\r
\r
switch(argument[0])\r
case 'H': usage_advanced(); usage_longhelp(); return 0;\r
\r
// Compression (default)\r
- case 'z': break;\r
+ case 'z': forceCompress = 1; break;\r
\r
// Compression level\r
case '0': \r
case '1':\r
- case '2': cLevel=0; break;\r
+ case '2':\r
case '3':\r
case '4':\r
case '5':\r
case '6':\r
case '7':\r
case '8':\r
- case '9': cLevel=1; break;\r
+ case '9': cLevel=*argument -'0'; break;\r
\r
// Use Legacy format (hidden option)\r
case 'l': legacy_format=1; break;\r
}\r
break;\r
\r
- // Pause at the end (benchmark only) (hidden option)\r
- case 'p': BMK_SetPause(); break;\r
+ // Pause at the end (hidden option)\r
+ case 'p': pause=1; BMK_SetPause(); break;\r
+\r
+ EXTENDED_ARGUMENTS;\r
\r
// Unrecognised command\r
default : badusage();\r
}\r
}\r
\r
- DISPLAYLEVEL(4, WELCOME_MESSAGE);\r
+ DISPLAYLEVEL(3, WELCOME_MESSAGE);\r
DISPLAYLEVEL(4, "Blocks size : %i KB\n", (1 << ((blockSizeId*2)-2)));\r
\r
// No input filename ==> use stdin\r
if(!input_filename) { input_filename=stdinmark; }\r
\r
+ // Check if input or output are defined as console; trigger an error in this case\r
+ if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage();\r
+\r
// Check if benchmark is selected\r
if (bench) return BMK_benchFile(argv+filenamesStart, argc-filenamesStart, cLevel);\r
\r
- // No output filename ==> select one automatically (when possible)\r
- if (!output_filename) \r
+ // No output filename ==> try to select one automatically (when possible)\r
+ while (!output_filename) \r
{\r
- if (!IS_CONSOLE(stdout)) { output_filename=stdoutmark; }\r
- else if (!decode) // compression\r
+ if (!IS_CONSOLE(stdout)) { output_filename=stdoutmark; break; } // Default to stdout whenever possible (i.e. not a console)\r
+ if ((!decode) && !(forceCompress)) // auto-determine compression or decompression, based on file extension\r
{\r
- int i=0, l=0;\r
- while (input_filename[l]!=0) l++;\r
+ size_t l = strlen(input_filename);\r
+ if (!strcmp(input_filename+(l-4), LZ4_EXTENSION)) decode=1;\r
+ }\r
+ if (!decode) // compression to file\r
+ {\r
+ size_t l = strlen(input_filename);\r
output_filename = (char*)calloc(1,l+5);\r
- for (i=0;i<l;i++) output_filename[i] = input_filename[i];\r
- for (i=l;i<l+4;i++) output_filename[i] = extension[i-l];\r
+ strcpy(output_filename, input_filename);\r
+ strcpy(output_filename+l, LZ4_EXTENSION);\r
DISPLAYLEVEL(2, "Compressed filename will be : %s \n", output_filename);\r
+ break;\r
}\r
- else // decompression (input file must respect format extension ".lz4")\r
+ // decompression to file (automatic name will work only if input filename has format extension ".lz4")\r
{\r
- int inl=0,outl;\r
- while (input_filename[inl]!=0) inl++;\r
+ size_t outl;\r
+ size_t inl = strlen(input_filename);\r
output_filename = (char*)calloc(1,inl+1);\r
- for (outl=0;outl<inl;outl++) output_filename[outl] = input_filename[outl];\r
+ strcpy(output_filename, input_filename);\r
+ outl = inl;\r
if (inl>4)\r
while ((outl >= inl-4) && (input_filename[outl] == extension[outl-inl+4])) output_filename[outl--]=0;\r
- if (outl != inl-5) { DISPLAYLEVEL(1, "Cannot automatically decide an output filename\n"); badusage(); }\r
+ if (outl != inl-5) { DISPLAYLEVEL(1, "Cannot determine an output filename\n"); badusage(); }\r
DISPLAYLEVEL(2, "Decoding file %s \n", output_filename);\r
}\r
}\r
\r
// No warning message in pure pipe mode (stdin + stdout)\r
- if (!strcmp(input_filename, stdinmark) && !strcmp(output_filename,stdoutmark) && (displayLevel>1) && (displayLevel<4)) displayLevel=1;\r
+ if (!strcmp(input_filename, stdinmark) && !strcmp(output_filename,stdoutmark) && (displayLevel==2)) displayLevel=1;\r
\r
// Check if input or output are defined as console; trigger an error in this case\r
if (!strcmp(input_filename, stdinmark) && IS_CONSOLE(stdin) ) badusage();\r
if (!strcmp(output_filename,stdoutmark) && IS_CONSOLE(stdout) && !forceStdout) badusage();\r
\r
// Decompress input if selected\r
- if (decode) return decodeFile(input_filename, output_filename);\r
-\r
- // compression is default action\r
- if (legacy_format)\r
- {\r
- DISPLAYLEVEL(2, "! Generating compressed LZ4 using Legacy format (deprecated !) ! \n");\r
- return legacy_compress_file(input_filename, output_filename, cLevel); \r
- }\r
+ if (decode) decodeFile(input_filename, output_filename);\r
else\r
+ // compression is default action\r
{\r
- return compress_file(input_filename, output_filename, cLevel);\r
+ if (legacy_format)\r
+ {\r
+ DISPLAYLEVEL(2, "! Generating compressed LZ4 using Legacy format (deprecated !) ! \n");\r
+ legacy_compress_file(input_filename, output_filename, cLevel);\r
+ }\r
+ else\r
+ {\r
+ DEFAULT_COMPRESSOR(input_filename, output_filename, cLevel);\r
+ }\r
}\r
+\r
+ if (pause) waitEnter();\r
}\r
projects / platform / upstream / lz4.git / commitdiff