From f4c9d753701c3cf1bab135ff5dc606e6fbd46fa3 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 12 Feb 2016 18:45:02 +0100 Subject: [PATCH] dictBuilder => zdict --- Makefile | 4 - dictBuilder/COPYING | 339 ------------------- dictBuilder/Makefile | 68 ---- dictBuilder/dibcli.c | 263 -------------- dictBuilder/dibio.c | 275 --------------- dictBuilder/dibio.h | 64 ---- dictBuilder/dictionary | Bin 112640 -> 0 bytes lib/Makefile | 5 +- lib/{dictBuilder.c => zdict.c} | 4 +- lib/{dictBuilder.h => zdict.h} | 0 lib/{dictBuilder_static.h => zdict_static.h} | 2 +- programs/Makefile | 4 +- programs/dibio.c | 14 +- programs/dibio.h | 2 +- 14 files changed, 12 insertions(+), 1032 deletions(-) delete mode 100644 dictBuilder/COPYING delete mode 100644 dictBuilder/Makefile delete mode 100644 dictBuilder/dibcli.c delete mode 100644 dictBuilder/dibio.c delete mode 100644 dictBuilder/dibio.h delete mode 100644 dictBuilder/dictionary rename lib/{dictBuilder.c => zdict.c} (99%) rename lib/{dictBuilder.h => zdict.h} (100%) rename lib/{dictBuilder_static.h => zdict_static.h} (99%) diff --git a/Makefile b/Makefile index c80b20f39..93d5e0528 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,6 @@ PRGDIR = programs ZSTDDIR = lib -DICTDIR = dictBuilder # Define nul output ifneq (,$(filter Windows%,$(OS))) @@ -51,7 +50,6 @@ default: zstdprogram all: $(MAKE) -C $(ZSTDDIR) $@ $(MAKE) -C $(PRGDIR) $@ - $(MAKE) -C $(DICTDIR) $@ zstdprogram: $(MAKE) -C $(PRGDIR) @@ -59,7 +57,6 @@ zstdprogram: clean: @$(MAKE) -C $(ZSTDDIR) $@ > $(VOID) @$(MAKE) -C $(PRGDIR) $@ > $(VOID) - @$(MAKE) -C $(DICTDIR) $@ > $(VOID) @echo Cleaning completed @@ -80,7 +77,6 @@ travis-install: test: $(MAKE) -C $(PRGDIR) $@ - $(MAKE) -C $(DICTDIR) $@ cmaketest: cd contrib/cmake ; cmake . ; $(MAKE) diff --git a/dictBuilder/COPYING b/dictBuilder/COPYING deleted file mode 100644 index d159169d1..000000000 --- a/dictBuilder/COPYING +++ /dev/null @@ -1,339 +0,0 @@ - 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. - - - Copyright (C) - - 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. - - , 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. diff --git a/dictBuilder/Makefile b/dictBuilder/Makefile deleted file mode 100644 index 949995253..000000000 --- a/dictBuilder/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# ########################################################################## -# Dict Builder - Makefile -# Copyright (C) Yann Collet 2016 -# -# GPL v2 License -# -# 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. -# -# You can contact the author at : -# - ZSTD homepage : http://www.zstd.net/ -# ########################################################################## - -CPPFLAGS= -I../lib -CFLAGS ?= -O3 -CFLAGS += -std=c99 -Wall -Wextra -Wshadow -Wcast-qual -Wcast-align -Wundef -Wstrict-prototypes -Wstrict-aliasing=1 -FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS) - -ZSTDDIR = ../lib - - -# Define *.exe as extension for Windows systems -ifneq (,$(filter Windows%,$(OS))) -EXT =.exe -VOID = nul -else -EXT = -VOID = /dev/null -endif - - -.PHONY: default all test - -default: dictBuilder - -all: dictBuilder - -dictBuilder: dibio.c dibcli.c $(ZSTDDIR)/dictBuilder.c $(ZSTDDIR)/huff0.c $(ZSTDDIR)/fse.c $(ZSTDDIR)/zstd_decompress.c $(ZSTDDIR)/zstd_compress.c $(ZSTDDIR)/divsufsort.c - $(CC) $(FLAGS) $^ -o $@$(EXT) - -clean: - @rm -f core *.o tmp* result* *.gcda \ - dictBuilder$(EXT) - @echo Cleaning completed - -test: dictBuilder - ./dictBuilder * - @rm dictionary - -clangtest: CC = clang -clangtest: CFLAGS += -Werror -clangtest: clean dictBuilder - -gpptest: CC = g++ -gpptest: CFLAGS=-O3 -Wall -Wextra -Wshadow -Wcast-align -Wcast-qual -Wundef -Werror -gpptest: clean dictBuilder - diff --git a/dictBuilder/dibcli.c b/dictBuilder/dibcli.c deleted file mode 100644 index a8009ae63..000000000 --- a/dictBuilder/dibcli.c +++ /dev/null @@ -1,263 +0,0 @@ -/* - dibcli - Command Line Interface (cli) for Dictionary Builder - Copyright (C) Yann Collet 2016 - - GPL v2 License - - 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. - - You can contact the author at : - - zstd source repository : https://github.com/Cyan4973/zstd -*/ - -/* ************************************** -* Compiler Specifics -****************************************/ -/* Disable some Visual warning messages */ -#ifdef _MSC_VER -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -#endif - - -/*-************************************ -* Includes -**************************************/ -#include /* exit, calloc, free */ -#include /* strcmp, strlen */ -#include /* fprintf, getchar */ -#include "dibio.h" -#include "zstd.h" /* version numbers */ - - -/*-************************************ -* Constants -**************************************/ -#define PROGRAM_DESCRIPTION "Dictionary builder" -#ifndef PROGRAM_VERSION -# define QUOTE(str) #str -# define EXP_Q(str) QUOTE(str) -# define PROGRAM_VERSION "v" EXP_Q(ZSTD_VERSION_MAJOR) "." EXP_Q(ZSTD_VERSION_MINOR) "." EXP_Q(ZSTD_VERSION_RELEASE) -#endif -#define AUTHOR "Yann Collet" -#define WELCOME_MESSAGE "*** %s %s %i-bits, by %s ***\n", PROGRAM_DESCRIPTION, PROGRAM_VERSION, (int)(sizeof(void*)*8), AUTHOR - -#define KB *(1 <<10) -#define MB *(1 <<20) -#define GB *(1U<<30) - -static const unsigned compressionLevelDefault = 5; -static const unsigned selectionLevelDefault = 9; /* determined experimentally */ -static const unsigned maxDictSizeDefault = 110 KB; -static const char* dictFileNameDefault = "dictionary"; - - -/*-************************************ -* Display Macros -**************************************/ -#define DISPLAY(...) fprintf(g_displayOut, __VA_ARGS__) -#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static FILE* g_displayOut; -static unsigned g_displayLevel = 2; // 0 : no display // 1: errors // 2 : + result + interaction + warnings ; // 3 : + progression; // 4 : + information - - -/*-************************************ -* Exceptions -**************************************/ -#define DEBUG 0 -#define DEBUGOUTPUT(...) if (DEBUG) DISPLAY(__VA_ARGS__); -#define EXM_THROW(error, ...) \ -{ \ - DEBUGOUTPUT("Error defined at %s, line %i : \n", __FILE__, __LINE__); \ - DISPLAYLEVEL(1, "Error %i : ", error); \ - DISPLAYLEVEL(1, __VA_ARGS__); \ - DISPLAYLEVEL(1, "\n"); \ - exit(error); \ -} - - -/*-************************************ -* Command Line -**************************************/ -static int usage(const char* programName) -{ - DISPLAY( "Usage :\n"); - DISPLAY( " %s [arg] [filenames]\n", programName); - DISPLAY( "\n"); - DISPLAY( "Arguments :\n"); - DISPLAY( " -o : name of dictionary file (default: %s) \n", dictFileNameDefault); - DISPLAY( "--maxdict : limit dictionary to specified size (default : %u) \n", maxDictSizeDefault); - DISPLAY( " -h/-H : display help/long help and exit\n"); - return 0; -} - -static int usage_advanced(const char* programName) -{ - DISPLAY(WELCOME_MESSAGE); - usage(programName); - DISPLAY( "\n"); - DISPLAY( "Advanced arguments :\n"); - DISPLAY( " -V : display Version number and exit\n"); - DISPLAY( "--fast : fast sampling mode\n"); - DISPLAY( " -L# : target compression level (default: %u)\n", compressionLevelDefault); - DISPLAY( " -S# : dictionary selectivity level (default: %u)\n", selectionLevelDefault); - DISPLAY( " -v : verbose mode\n"); - DISPLAY( " -q : suppress notifications; specify twice to suppress errors too\n"); - return 0; -} - -static int badusage(const char* programName) -{ - DISPLAYLEVEL(1, "Incorrect parameters\n"); - if (g_displayLevel >= 1) usage(programName); - return 1; -} - - -static void waitEnter(void) -{ - int unused; - DISPLAY("Press enter to continue...\n"); - unused = getchar(); - (void)unused; -} - - -int main(int argCount, const char** argv) -{ - int i, - main_pause=0, - operationResult=0, - nextArgumentIsMaxDict=0, - nextArgumentIsDictFileName=0; - unsigned cLevel = compressionLevelDefault; - unsigned maxDictSize = maxDictSizeDefault; - unsigned selectionLevel = selectionLevelDefault; - const char** filenameTable = (const char**)malloc(argCount * sizeof(const char*)); /* argCount >= 1 */ - unsigned filenameIdx = 0; - const char* programName = argv[0]; - const char* dictFileName = dictFileNameDefault; - - /* init */ - g_displayOut = stderr; /* unfortunately, cannot be set at declaration */ - if (filenameTable==NULL) EXM_THROW(1, "not enough memory\n"); - /* Pick out program name from path. Don't rely on stdlib because of conflicting behavior */ - for (i = (int)strlen(programName); i > 0; i--) { if ((programName[i] == '/') || (programName[i] == '\\')) { i++; break; } } - programName += i; - - /* command switches */ - for(i=1; i='0') && (*argument<='9')) - maxDictSize = maxDictSize * 10 + (*argument - '0'), argument++; - if (*argument=='k' || *argument=='K') - maxDictSize <<= 10; - continue; - } - - /* long commands (--long-word) */ - if (!strcmp(argument, "--version")) { g_displayOut=stdout; DISPLAY(WELCOME_MESSAGE); return 0; } - if (!strcmp(argument, "--help")) { g_displayOut=stdout; return usage_advanced(programName); } - if (!strcmp(argument, "--verbose")) { g_displayLevel++; if (g_displayLevel<3) g_displayLevel=3; continue; } - if (!strcmp(argument, "--quiet")) { g_displayLevel--; continue; } - if (!strcmp(argument, "--maxdict")) { nextArgumentIsMaxDict=1; continue; } - if (!strcmp(argument, "--fast")) { selectionLevel=1; cLevel=1; continue; } - - /* Decode commands (note : aggregated commands are allowed) */ - if (argument[0]=='-') { - argument++; - - while (argument[0]!=0) { - switch(argument[0]) - { - /* Display help */ - case 'V': g_displayOut=stdout; DISPLAY(WELCOME_MESSAGE); return 0; /* Version Only */ - case 'H': - case 'h': g_displayOut=stdout; return usage_advanced(programName); - - /* Selection level */ - case 'S': argument++; - selectionLevel = 0; - while ((*argument >= '0') && (*argument <= '9')) - selectionLevel *= 10, selectionLevel += *argument++ - '0'; - break; - - /* Selection level */ - case 'L': argument++; - cLevel = 0; - while ((*argument >= '0') && (*argument <= '9')) - cLevel *= 10, cLevel += *argument++ - '0'; - break; - - /* Verbose mode */ - case 'v': g_displayLevel++; if (g_displayLevel<3) g_displayLevel=3; argument++; break; - - /* Quiet mode */ - case 'q': g_displayLevel--; argument++; break; - - /* dictionary name */ - case 'o': nextArgumentIsDictFileName=1; argument++; break; - - /* Pause at the end (hidden option) */ - case 'p': main_pause=1; argument++; break; - - /* unknown command */ - default : return badusage(programName); - } } - continue; - } - - /* add filename to list */ - filenameTable[filenameIdx++] = argument; - } - - /* Welcome message (if verbose) */ - DISPLAYLEVEL(3, WELCOME_MESSAGE); - - /* check nb files */ - if (filenameIdx==0) return badusage(programName); - if (filenameIdx < 100) - { - DISPLAYLEVEL(2, "Warning : set contains only %u files ... \n", filenameIdx); - DISPLAYLEVEL(3, "!! For better results, consider providing > 1.000 samples !!\n"); - DISPLAYLEVEL(3, "!! Each sample should preferably be stored as a separate file !!\n"); - } - - /* building ... */ - { - ZDICT_params_t param; - param.selectivityLevel = selectionLevel; - param.compressionLevel = cLevel; - DiB_setNotificationLevel(g_displayLevel); - operationResult = DiB_trainFromFiles(dictFileName, maxDictSize, - filenameTable, filenameIdx, - param); - } - - if (main_pause) waitEnter(); - free((void*)filenameTable); - return operationResult; -} diff --git a/dictBuilder/dibio.c b/dictBuilder/dibio.c deleted file mode 100644 index a471d5450..000000000 --- a/dictBuilder/dibio.c +++ /dev/null @@ -1,275 +0,0 @@ -/* - dibio - I/O API for dictionary builder - Copyright (C) Yann Collet 2016 - - GPL v2 License - - 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. - - You can contact the author at : - - zstd homepage : http://www.zstd.net/ -*/ - -/*-************************************** -* Compiler Options -****************************************/ -/* Disable some Visual warning messages */ -#ifdef _MSC_VER -# define _CRT_SECURE_NO_WARNINGS /* fopen */ -# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -#endif - -/* Unix Large Files support (>4GB) */ -#define _FILE_OFFSET_BITS 64 -#if (defined(__sun__) && (!defined(__LP64__))) /* Sun Solaris 32-bits requires specific definitions */ -# define _LARGEFILE_SOURCE -#elif ! defined(__LP64__) /* No point defining Large file for 64 bit */ -# define _LARGEFILE64_SOURCE -#endif - - -/*-************************************* -* Includes -***************************************/ -#include /* malloc, free */ -#include /* memset */ -#include /* fprintf, fopen, ftello64 */ -#include /* stat64 */ -#include /* stat64 */ -#include /* clock */ - -#include "mem.h" /* read */ -#include "error_private.h" -#include "dictBuilder_static.h" - -/*-************************************* -* Compiler specifics -***************************************/ -#if !defined(S_ISREG) -# define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) -#endif - - -/*-************************************* -* Constants -***************************************/ -#define KB *(1 <<10) -#define MB *(1 <<20) -#define GB *(1U<<30) - -#define DICTLISTSIZE 10000 -#define MEMMULT 11 -static const size_t maxMemory = (sizeof(size_t) == 4) ? (2 GB - 64 MB) : ((size_t)(512 MB) << sizeof(size_t)); - -#define NOISELENGTH 32 -#define PRIME1 2654435761U -#define PRIME2 2246822519U - - -/*-************************************* -* Console display -***************************************/ -#define DISPLAY(...) fprintf(stderr, __VA_ARGS__) -#define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); } -static unsigned g_displayLevel = 0; /* 0 : no display; 1: errors; 2: default; 4: full information */ -void DiB_setNotificationLevel(unsigned l) { g_displayLevel=l; ZDICT_setNotificationLevel(l); } - -void DiB_printHex(U32 dlevel, const void* ptr, size_t length) -{ - const BYTE* const b = (const BYTE*)ptr; - size_t u; - for (u=0; u126) c = '.'; /* non-printable char */ - DISPLAYLEVEL(dlevel, "%c", c); - } -} - - -/*-************************************* -* Exceptions -***************************************/ -#ifndef DEBUG -# define DEBUG 0 -#endif -#define DEBUGOUTPUT(...) if (DEBUG) DISPLAY(__VA_ARGS__); -#define EXM_THROW(error, ...) \ -{ \ - DEBUGOUTPUT("Error defined at %s, line %i : \n", __FILE__, __LINE__); \ - DISPLAYLEVEL(1, "Error %i : ", error); \ - DISPLAYLEVEL(1, __VA_ARGS__); \ - DISPLAYLEVEL(1, "\n"); \ - exit(error); \ -} - - -/* ******************************************************** -* Helper functions -**********************************************************/ -unsigned DiB_isError(size_t errorCode) { return ERR_isError(errorCode); } - -const char* DiB_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); } - - -/* ******************************************************** -* File related operations -**********************************************************/ -static unsigned long long DiB_getFileSize(const char* infilename) -{ - int r; -#if defined(_MSC_VER) - struct _stat64 statbuf; - r = _stat64(infilename, &statbuf); -#else - struct stat statbuf; - r = stat(infilename, &statbuf); -#endif - if (r || !S_ISREG(statbuf.st_mode)) return 0; /* No good... */ - return (unsigned long long)statbuf.st_size; -} - - -static unsigned long long DiB_getTotalFileSize(const char** fileNamesTable, unsigned nbFiles) -{ - unsigned long long total = 0; - unsigned n; - for (n=0; n bufferSize-pos) fileSize = 0; /* stop there, not enough memory to load all files */ - readSize = fread(buff+pos, 1, (size_t)fileSize, f); - if (readSize != (size_t)fileSize) EXM_THROW(11, "could not read %s", fileNamesTable[n]); - pos += readSize; - fileSizes[n] = (size_t)fileSize; - fclose(f); - } -} - - -/*-******************************************************** -* Dictionary training functions -**********************************************************/ -static size_t DiB_findMaxMem(unsigned long long requiredMem) -{ - size_t step = 8 MB; - void* testmem = NULL; - - requiredMem = (((requiredMem >> 23) + 1) << 23); - requiredMem += 2 * step; - if (requiredMem > maxMemory) requiredMem = maxMemory; - - while (!testmem) { - requiredMem -= step; - testmem = malloc((size_t)requiredMem); - } - - free(testmem); - return (size_t)(requiredMem - step); -} - - -static void DiB_fillNoise(void* buffer, size_t length) -{ - unsigned acc = PRIME1; - size_t p=0;; - - for (p=0; p> 21); - } -} - - -static void DiB_saveDict(const char* dictFileName, - const void* buff, size_t buffSize) -{ - FILE* f; - size_t n; - - f = fopen(dictFileName, "wb"); - if (f==NULL) EXM_THROW(3, "cannot open %s ", dictFileName); - - n = fwrite(buff, 1, buffSize, f); - if (n!=buffSize) EXM_THROW(4, "%s : write error", dictFileName) - - n = (size_t)fclose(f); - if (n!=0) EXM_THROW(5, "%s : flush error", dictFileName) -} - - -int DiB_trainFromFiles(const char* dictFileName, unsigned maxDictSize, - const char** fileNamesTable, unsigned nbFiles, - ZDICT_params_t params) -{ - void* srcBuffer; - size_t benchedSize; - size_t* fileSizes = (size_t*)malloc(nbFiles * sizeof(size_t)); - unsigned long long totalSizeToLoad = DiB_getTotalFileSize(fileNamesTable, nbFiles); - void* dictBuffer = malloc(maxDictSize); - size_t dictSize; - int result = 0; - - /* init */ - benchedSize = DiB_findMaxMem(totalSizeToLoad * MEMMULT) / MEMMULT; - if ((unsigned long long)benchedSize > totalSizeToLoad) benchedSize = (size_t)totalSizeToLoad; - if (benchedSize < totalSizeToLoad) - DISPLAYLEVEL(1, "Not enough memory; training on %u MB only...\n", (unsigned)(benchedSize >> 20)); - - /* Memory allocation & restrictions */ - srcBuffer = malloc(benchedSize+NOISELENGTH); /* + noise */ - if ((!fileSizes) || (!srcBuffer) || (!dictBuffer)) EXM_THROW(12, "not enough memory for DiB_trainFiles"); /* should not happen */ - - /* Load input buffer */ - DiB_loadFiles(srcBuffer, benchedSize, fileSizes, fileNamesTable, nbFiles); - DiB_fillNoise((char*)srcBuffer + benchedSize, NOISELENGTH); /* guard band, for end of buffer condition */ - - /* call buffer version */ - dictSize = ZDICT_trainFromBuffer_unsafe(dictBuffer, maxDictSize, - srcBuffer, fileSizes, nbFiles, - params); - if (ZDICT_isError(dictSize)) { - DISPLAYLEVEL(1, "dictionary training failed : %s", ZDICT_getErrorName(dictSize)); /* should not happen */ - result = 1; - goto _cleanup; - } - - /* save dict */ - DISPLAYLEVEL(2, "Save dictionary of size %u into file %s \n", (U32)dictSize, dictFileName); - DiB_saveDict(dictFileName, dictBuffer, dictSize); - - /* clean up */ -_cleanup: - free(srcBuffer); - free(dictBuffer); - free(fileSizes); - return result; -} diff --git a/dictBuilder/dibio.h b/dictBuilder/dibio.h deleted file mode 100644 index c9aee1fcd..000000000 --- a/dictBuilder/dibio.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - dibio.h - I/O API for dictionary builder - Copyright (C) Yann Collet 2016 - - GPL v2 License - - 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. - - You can contact the author at : - - zstd source repository : https://github.com/Cyan4973/zstd - - ztsd public forum : https://groups.google.com/forum/#!forum/lz4c -*/ - -/* This library is designed for a single-threaded console application. -* It exit() and printf() into stderr when it encounters an error condition. */ - -#ifndef DIBIO_H_003 -#define DIBIO_H_003 - - -/*-************************************* -* Dependencies -***************************************/ -#include "dictBuilder_static.h" /* ZDICT_params_t */ - - -/*-************************************* -* Public functions -***************************************/ -/*! DiB_trainFromFiles() : - Train a dictionary from a set of files provided by `fileNamesTable`. - Resulting dictionary is written into file `dictFileName`. - `parameters` is optional and can be provided with values set to 0, meaning "default". - @return : 0 == ok. Any other : error. -*/ -int DiB_trainFromFiles(const char* dictFileName, unsigned maxDictSize, - const char** fileNamesTable, unsigned nbFiles, - ZDICT_params_t parameters); - - -/*-************************************* -* Helper functions -***************************************/ -/*! DiB_setNotificationLevel - Set amount of notification to be displayed on the console. - default initial value : 0 = no console notification. - Note : not thread-safe (use a global constant) -*/ -void DiB_setNotificationLevel(unsigned l); - - -#endif diff --git a/dictBuilder/dictionary b/dictBuilder/dictionary deleted file mode 100644 index d6bf575c61f3b366de2c0aadadb0b484deaf377d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112640 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 Xnn*h->!a-xKTVJ2qh8TvnyCK^?B0R| diff --git a/lib/Makefile b/lib/Makefile index 5ce8c18b7..2b724b7b7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -51,7 +51,7 @@ FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS) LIBDIR ?= $(PREFIX)/lib INCLUDEDIR=$(PREFIX)/include -ZSTD_FILES := zstd_compress.c zstd_decompress.c fse.c huff0.c dictBuilder.c divsufsort.c +ZSTD_FILES := zstd_compress.c zstd_decompress.c fse.c huff0.c zdict.c divsufsort.c ZSTD_LEGACY:= legacy/zstd_v01.c legacy/zstd_v02.c legacy/zstd_v03.c legacy/zstd_v04.c ifeq ($(ZSTD_LEGACY_SUPPORT), 0) @@ -119,6 +119,7 @@ install: libzstd libzstd.pc @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd_buffered.h + @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zdict.h @echo zstd static and shared library installed uninstall: @@ -128,6 +129,8 @@ uninstall: @[ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) @[ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.a @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd.h + @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd_buffered.h + @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zdict.h @echo zstd libraries successfully uninstalled endif diff --git a/lib/dictBuilder.c b/lib/zdict.c similarity index 99% rename from lib/dictBuilder.c rename to lib/zdict.c index 50b67d58d..ec2ffbb70 100644 --- a/lib/dictBuilder.c +++ b/lib/zdict.c @@ -61,11 +61,11 @@ #include "mem.h" /* read */ #include "error_private.h" -#include "divsufsort.h" -#include "dictBuilder_static.h" #include "fse.h" #include "huff0_static.h" #include "zstd_internal.h" +#include "divsufsort.h" +#include "zdict_static.h" /*-************************************* diff --git a/lib/dictBuilder.h b/lib/zdict.h similarity index 100% rename from lib/dictBuilder.h rename to lib/zdict.h diff --git a/lib/dictBuilder_static.h b/lib/zdict_static.h similarity index 99% rename from lib/dictBuilder_static.h rename to lib/zdict_static.h index 0bddb30df..e1ef73136 100644 --- a/lib/dictBuilder_static.h +++ b/lib/zdict_static.h @@ -44,7 +44,7 @@ extern "C" { /*-************************************* * Dependencies ***************************************/ -#include "dictBuilder.h" +#include "zdict.h" /*-************************************* diff --git a/programs/Makefile b/programs/Makefile index b107b72d6..e96a0dd20 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -84,11 +84,11 @@ default: zstd all: zstd zstd32 fullbench fullbench32 fuzzer fuzzer32 zbufftest zbufftest32 paramgrill datagen -zstd : $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/dictBuilder.c $(ZSTDDIR)/divsufsort.c \ +zstd : $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \ zstdcli.c fileio.c bench.c xxhash.c datagen.c dibio.c $(CC) $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT) -zstd32: $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/dictBuilder.c $(ZSTDDIR)/divsufsort.c \ +zstd32: $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zstd_buffered.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \ zstdcli.c fileio.c bench.c xxhash.c datagen.c dibio.c $(CC) -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT) diff --git a/programs/dibio.c b/programs/dibio.c index a471d5450..7b6611536 100644 --- a/programs/dibio.c +++ b/programs/dibio.c @@ -52,7 +52,8 @@ #include "mem.h" /* read */ #include "error_private.h" -#include "dictBuilder_static.h" +#include "zdict_static.h" + /*-************************************* * Compiler specifics @@ -86,17 +87,6 @@ static const size_t maxMemory = (sizeof(size_t) == 4) ? (2 GB - 64 MB) : ((size_ static unsigned g_displayLevel = 0; /* 0 : no display; 1: errors; 2: default; 4: full information */ void DiB_setNotificationLevel(unsigned l) { g_displayLevel=l; ZDICT_setNotificationLevel(l); } -void DiB_printHex(U32 dlevel, const void* ptr, size_t length) -{ - const BYTE* const b = (const BYTE*)ptr; - size_t u; - for (u=0; u126) c = '.'; /* non-printable char */ - DISPLAYLEVEL(dlevel, "%c", c); - } -} - /*-************************************* * Exceptions diff --git a/programs/dibio.h b/programs/dibio.h index 9b8deb54b..4d24cc16a 100644 --- a/programs/dibio.h +++ b/programs/dibio.h @@ -32,7 +32,7 @@ /*-************************************* * Dependencies ***************************************/ -#include "dictBuilder_static.h" /* ZDICT_params_t */ +#include "zdict_static.h" /* ZDICT_params_t */ /*-*************************************