diff options
author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 15:08:12 +0000 |
---|---|---|
committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 15:08:12 +0000 |
commit | 9eab306d85e2f8e6ba93f33ce3c04f238e969b67 (patch) | |
tree | f832251ea988b9ee317ba7a6f0defea0c77fbea4 | |
parent | Initial commit. (diff) | |
download | plzip-upstream/0.1.tar.xz plzip-upstream/0.1.zip |
Adding upstream version 0.1.upstream/0.1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
-rw-r--r-- | AUTHORS | 4 | ||||
-rw-r--r-- | COPYING | 676 | ||||
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | INSTALL | 57 | ||||
-rw-r--r-- | Makefile.in | 107 | ||||
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | README | 21 | ||||
-rw-r--r-- | arg_parser.cc | 193 | ||||
-rw-r--r-- | arg_parser.h | 95 | ||||
-rwxr-xr-x | configure | 213 | ||||
-rw-r--r-- | doc/plzip.1 | 71 | ||||
-rw-r--r-- | doc/plzip.info | 303 | ||||
-rw-r--r-- | doc/plzip.texinfo | 311 | ||||
-rw-r--r-- | lacos_rbtree.cc | 418 | ||||
-rw-r--r-- | lacos_rbtree.h | 249 | ||||
-rw-r--r-- | main.cc | 1300 | ||||
-rw-r--r-- | main.h | 80 | ||||
-rw-r--r-- | plzip.cc | 669 | ||||
-rw-r--r-- | plzip.h | 30 | ||||
-rw-r--r-- | testsuite/COPYING.lz | bin | 0 -> 11540 bytes | |||
-rwxr-xr-x | testsuite/check.sh | 69 |
21 files changed, 4890 insertions, 0 deletions
@@ -0,0 +1,4 @@ +Plzip was written by Laszlo Ersek and Antonio Diaz Diaz. + +Plzip uses a simplified version of the LZMA algorithm. +The original LZMA algorithm was designed by Igor Pavlov. @@ -0,0 +1,676 @@ +
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. 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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. 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.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ 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.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+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.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ 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
+state 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program 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, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU 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. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..7009187 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,21 @@ +2009-12-05 Antonio Diaz Diaz <ant_diaz@teleline.es> + + * Version 0.1 released. + * This version is based on llzip-0.03 (2009-11-21), written by + Laszlo Ersek <lacos@caesar.elte.hu>. + From llzip-0.03/README: + + llzip is a hack on my lbzip2-0.17 release. I ripped out the + decompression stuff, and replaced the bzip2 compression with + the lzma compression from lzlib-0.7. llzip is mainly meant + as an assisted fork point for the lzip developers. + Nonetheless, I tried to review the diff against lbzip2-0.17 + thoroughly, and I think llzip should be usable on its own + until something better appears on the net. + + +Copyright (C) 2009 Antonio Diaz Diaz. + +This file is a collection of facts, and thus it is not copyrightable, +but just in case, I give you unlimited permission to copy, distribute +and modify it. @@ -0,0 +1,57 @@ +Requirements +------------ +You will need a C++ compiler and the lzlib compression library installed. +I use gcc 4.3.4 and 3.3.6, but the code should compile with any +standards compliant compiler. +Gcc is available at http://gcc.gnu.org. +Lzlib is available at http://www.nongnu.org/lzip/lzlib.html. + + +Procedure +--------- +1. Unpack the archive if you have not done so already: + + lzip -cd plzip[version].tar.lz | tar -xf - +or + gzip -cd plzip[version].tar.gz | tar -xf - + +This creates the directory ./plzip[version] containing the source from +the main archive. + +2. Change to plzip directory and run configure. + (Try `configure --help' for usage instructions). + + cd plzip[version] + ./configure + +3. Run make. + + make + +4. Optionally, type `make check' to run the tests that come with plzip. + +5. Type `make install' to install the program and any data files and + documentation. + + +Another way +----------- +You can also compile plzip into a separate directory. To do this, you +must use a version of `make' that supports the `VPATH' variable, such +as GNU `make'. `cd' to the directory where you want the object files +and executables to go and run the `configure' script. `configure' +automatically checks for the source code in `.', in `..' and in the +directory that `configure' is in. + +`configure' recognizes the option `--srcdir=DIR' to control where to +look for the sources. Usually `configure' can determine that directory +automatically. + +After running `configure', you can run `make' and `make install' as +explained above. + + +Copyright (C) 2009 Antonio Diaz Diaz. + +This file is free documentation: you have unlimited permission to copy, +distribute and modify it. diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..6f27327 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,107 @@ + +DISTNAME = $(progname)-$(progversion) +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -m 755 +INSTALL_DATA = $(INSTALL) -p -m 644 +INSTALL_DIR = $(INSTALL) -d -m 755 +LIBS = -llz -lpthread +SHELL = /bin/sh + +objs = arg_parser.o lacos_rbtree.o plzip.o main.o + + +.PHONY : all install install-info install-man install-strip \ + uninstall uninstall-info uninstall-man \ + doc info man check dist clean distclean + +all : $(progname) + +$(progname) : $(objs) + $(CXX) $(LDFLAGS) -o $(progname) $(objs) $(LIBS) + +$(progname)_profiled : $(objs) + $(CXX) $(LDFLAGS) -pg -o $(progname)_profiled $(objs) $(LIBS) + +main.o : main.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $< + +%.o : %.cc + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +$(objs) : Makefile +arg_parser.o : arg_parser.h +lacos_rbtree.o: lacos_rbtree.h +main.o : arg_parser.h main.h plzip.h +plzip.o : lacos_rbtree.h main.h plzip.h + +doc : info man + +info : $(VPATH)/doc/$(progname).info + +$(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo + cd $(VPATH)/doc && makeinfo $(progname).texinfo + +man : $(VPATH)/doc/$(progname).1 + +$(VPATH)/doc/$(progname).1 : $(progname) + help2man -n 'data compressor based on the LZMA algorithm' \ + -o $(VPATH)/doc/$(progname).1 ./$(progname) + +Makefile : $(VPATH)/configure $(VPATH)/Makefile.in + ./config.status + +check : all $(VPATH)/testsuite/check.sh + @$(VPATH)/testsuite/check.sh $(VPATH)/testsuite + +install : all install-info install-man + if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL_DIR) $(DESTDIR)$(bindir) ; fi + $(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname) + +install-info : + if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi + $(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info + -install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(progname).info + +install-man : + if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi + $(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1 + +install-strip : all + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + +uninstall : uninstall-info uninstall-man + -rm -f $(DESTDIR)$(bindir)/$(progname) + +uninstall-info : + -install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info + -rm -f $(DESTDIR)$(infodir)/$(progname).info + +uninstall-man : + -rm -f $(DESTDIR)$(mandir)/man1/$(progname).1 + +dist : + ln -sf $(VPATH) $(DISTNAME) + tar -cvf $(DISTNAME).tar \ + $(DISTNAME)/AUTHORS \ + $(DISTNAME)/COPYING \ + $(DISTNAME)/ChangeLog \ + $(DISTNAME)/INSTALL \ + $(DISTNAME)/Makefile.in \ + $(DISTNAME)/NEWS \ + $(DISTNAME)/README \ + $(DISTNAME)/configure \ + $(DISTNAME)/doc/$(progname).1 \ + $(DISTNAME)/doc/$(progname).info \ + $(DISTNAME)/doc/$(progname).texinfo \ + $(DISTNAME)/testsuite/COPYING.lz \ + $(DISTNAME)/testsuite/check.sh \ + $(DISTNAME)/*.h \ + $(DISTNAME)/*.cc + rm -f $(DISTNAME) + lzip -v -9 $(DISTNAME).tar + +clean : + -rm -f $(progname) $(progname)_profiled $(objs) + +distclean : clean + -rm -f Makefile config.status *.tar *.tar.lz @@ -0,0 +1,3 @@ +Changes in version 0.1: + +Initial release. @@ -0,0 +1,21 @@ +Description + +Plzip is a parallel version of the lzip data compressor. Currently only +compression is performed in parallel. Parallel decompression is planned +to be implemented soon. + +Lzip is a lossless data compressor based on the LZMA algorithm, with +very safe integrity checking and a user interface similar to the one of +gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses +better than bzip2, which makes it well suited for software distribution +and data archiving. + + +Copyright (C) 2009 Antonio Diaz Diaz. + +This file is free documentation: you have unlimited permission to copy, +distribute and modify it. + +The file Makefile.in is a data file used by configure to produce the +Makefile. It has the same copyright owner and permissions that this +file. diff --git a/arg_parser.cc b/arg_parser.cc new file mode 100644 index 0000000..b889e1a --- /dev/null +++ b/arg_parser.cc @@ -0,0 +1,193 @@ +/* Arg_parser - A POSIX/GNU command line argument parser. + Copyright (C) 2006, 2007, 2008, 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +#include <cstring> +#include <string> +#include <vector> + +#include "arg_parser.h" + + +bool Arg_parser::parse_long_option( const char * const opt, const char * const arg, + const Option options[], int & argind ) + { + unsigned int len; + int index = -1; + bool exact = false, ambig = false; + + for( len = 0; opt[len+2] && opt[len+2] != '='; ++len ) ; + + // Test all long options for either exact match or abbreviated matches. + for( int i = 0; options[i].code != 0; ++i ) + if( options[i].name && !std::strncmp( options[i].name, &opt[2], len ) ) + { + if( std::strlen( options[i].name ) == len ) // Exact match found + { index = i; exact = true; break; } + else if( index < 0 ) index = i; // First nonexact match found + else if( options[index].code != options[i].code || + options[index].has_arg != options[i].has_arg ) + ambig = true; // Second or later nonexact match found + } + + if( ambig && !exact ) + { + error_ = "option `"; error_ += opt; error_ += "' is ambiguous"; + return false; + } + + if( index < 0 ) // nothing found + { + error_ = "unrecognized option `"; error_ += opt; error_ += '\''; + return false; + } + + ++argind; + data.push_back( Record( options[index].code ) ); + + if( opt[len+2] ) // `--<long_option>=<argument>' syntax + { + if( options[index].has_arg == no ) + { + error_ = "option `--"; error_ += options[index].name; + error_ += "' doesn't allow an argument"; + return false; + } + if( options[index].has_arg == yes && !opt[len+3] ) + { + error_ = "option `--"; error_ += options[index].name; + error_ += "' requires an argument"; + return false; + } + data.back().argument = &opt[len+3]; + return true; + } + + if( options[index].has_arg == yes ) + { + if( !arg || !arg[0] ) + { + error_ = "option `--"; error_ += options[index].name; + error_ += "' requires an argument"; + return false; + } + ++argind; data.back().argument = arg; + return true; + } + + return true; + } + + +bool Arg_parser::parse_short_option( const char * const opt, const char * const arg, + const Option options[], int & argind ) + { + int cind = 1; // character index in opt + + while( cind > 0 ) + { + int index = -1; + const unsigned char c = opt[cind]; + + if( c != 0 ) + for( int i = 0; options[i].code; ++i ) + if( c == options[i].code ) + { index = i; break; } + + if( index < 0 ) + { + error_ = "invalid option -- "; error_ += c; + return false; + } + + data.push_back( Record( c ) ); + if( opt[++cind] == 0 ) { ++argind; cind = 0; } // opt finished + + if( options[index].has_arg != no && cind > 0 && opt[cind] ) + { + data.back().argument = &opt[cind]; ++argind; cind = 0; + } + else if( options[index].has_arg == yes ) + { + if( !arg || !arg[0] ) + { + error_ = "option requires an argument -- "; error_ += c; + return false; + } + data.back().argument = arg; ++argind; cind = 0; + } + } + return true; + } + + +Arg_parser::Arg_parser( const int argc, const char * const argv[], + const Option options[], const bool in_order ) + { + if( argc < 2 || !argv || !options ) return; + + std::vector< std::string > non_options; // skipped non-options + int argind = 1; // index in argv + + while( argind < argc ) + { + const unsigned char ch1 = argv[argind][0]; + const unsigned char ch2 = ( ch1 ? argv[argind][1] : 0 ); + + if( ch1 == '-' && ch2 ) // we found an option + { + const char * const opt = argv[argind]; + const char * const arg = (argind + 1 < argc) ? argv[argind+1] : 0; + if( ch2 == '-' ) + { + if( !argv[argind][2] ) { ++argind; break; } // we found "--" + else if( !parse_long_option( opt, arg, options, argind ) ) break; + } + else if( !parse_short_option( opt, arg, options, argind ) ) break; + } + else + { + if( !in_order ) non_options.push_back( argv[argind++] ); + else { data.push_back( Record() ); data.back().argument = argv[argind++]; } + } + } + if( error_.size() ) data.clear(); + else + { + for( unsigned int i = 0; i < non_options.size(); ++i ) + { data.push_back( Record() ); data.back().argument.swap( non_options[i] ); } + while( argind < argc ) + { data.push_back( Record() ); data.back().argument = argv[argind++]; } + } + } + + +Arg_parser::Arg_parser( const char * const opt, const char * const arg, + const Option options[] ) + { + if( !opt || !opt[0] || !options ) return; + + if( opt[0] == '-' && opt[1] ) // we found an option + { + int argind = 1; // dummy + if( opt[1] == '-' ) + { if( opt[2] ) parse_long_option( opt, arg, options, argind ); } + else + parse_short_option( opt, arg, options, argind ); + if( error_.size() ) data.clear(); + } + else { data.push_back( Record() ); data.back().argument = opt; } + } diff --git a/arg_parser.h b/arg_parser.h new file mode 100644 index 0000000..fa6161b --- /dev/null +++ b/arg_parser.h @@ -0,0 +1,95 @@ +/* Arg_parser - A POSIX/GNU command line argument parser. + Copyright (C) 2006, 2007, 2008, 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +/* Arg_parser reads the arguments in `argv' and creates a number of + option codes, option arguments and non-option arguments. + + In case of error, `error' returns a non-empty error message. + + `options' is an array of `struct Option' terminated by an element + containing a code which is zero. A null name means a short-only + option. A code value outside the unsigned char range means a + long-only option. + + Arg_parser normally makes it appear as if all the option arguments + were specified before all the non-option arguments for the purposes + of parsing, even if the user of your program intermixed option and + non-option arguments. If you want the arguments in the exact order + the user typed them, call `Arg_parser' with `in_order' = true. + + The argument `--' terminates all options; any following arguments are + treated as non-option arguments, even if they begin with a hyphen. + + The syntax for optional option arguments is `-<short_option><argument>' + (without whitespace), or `--<long_option>=<argument>'. +*/ + +class Arg_parser + { +public: + enum Has_arg { no, yes, maybe }; + + struct Option + { + int code; // Short option letter or code ( code != 0 ) + const char * name; // Long option name (maybe null) + Has_arg has_arg; + }; + +private: + struct Record + { + int code; + std::string argument; + Record( const int c = 0 ) : code( c ) {} + }; + + std::string error_; + std::vector< Record > data; + + bool parse_long_option( const char * const opt, const char * const arg, + const Option options[], int & argind ); + bool parse_short_option( const char * const opt, const char * const arg, + const Option options[], int & argind ); + +public: + Arg_parser( const int argc, const char * const argv[], + const Option options[], const bool in_order = false ); + + // Restricted constructor. Parses a single token and argument (if any) + Arg_parser( const char * const opt, const char * const arg, + const Option options[] ); + + const std::string & error() const throw() { return error_; } + + // The number of arguments parsed (may be different from argc) + int arguments() const throw() { return data.size(); } + + // If code( i ) is 0, argument( i ) is a non-option. + // Else argument( i ) is the option's argument (or empty). + int code( const int i ) const throw() + { + if( i >= 0 && i < arguments() ) return data[i].code; + else return 0; + } + + const std::string & argument( const int i ) const throw() + { + if( i >= 0 && i < arguments() ) return data[i].argument; + else return error_; + } + }; diff --git a/configure b/configure new file mode 100755 index 0000000..6f18fa3 --- /dev/null +++ b/configure @@ -0,0 +1,213 @@ +#! /bin/sh +# configure script for Plzip - A parallel version of the lzip data compressor +# Copyright (C) 2009 Antonio Diaz Diaz. +# +# This configure script is free software: you have unlimited permission +# to copy, distribute and modify it. +# +# Date of this version: 2009-09-05 + +args= +no_create= +progname=plzip +progversion=0.1 +srctrigger=plzip.h + +# clear some things potentially inherited from environment. +LC_ALL=C +export LC_ALL +srcdir= +prefix=/usr/local +exec_prefix='$(prefix)' +bindir='$(exec_prefix)/bin' +datadir='$(prefix)/share' +infodir='$(datadir)/info' +mandir='$(datadir)/man' +sysconfdir='$(prefix)/etc' +CC= +CXX= +CPPFLAGS= +CFLAGS='-Wall -W -O2' +CXXFLAGS='-Wall -W -O2' +LDFLAGS= + +# Loop over all args +while [ x"$1" != x ] ; do + + # Get the first arg, and shuffle + option=$1 + shift + + # Add the argument quoted to args + args="${args} \"${option}\"" + + # Split out the argument for options that take them + case ${option} in + *=*) optarg=`echo ${option} | sed -e 's,^[^=]*=,,'` ;; + esac + + # Process the options + case ${option} in + --help | --he* | -h) + echo "Usage: configure [options]" + echo + echo "Options: [defaults in brackets]" + echo " -h, --help display this help and exit" + echo " -V, --version output version information and exit" + echo " --srcdir=DIR find the sources in DIR [. or ..]" + echo " --prefix=DIR install into DIR [${prefix}]" + echo " --exec-prefix=DIR base directory for arch-dependent files [${exec_prefix}]" + echo " --bindir=DIR user executables directory [${bindir}]" + echo " --datadir=DIR base directory for doc and data [${datadir}]" + echo " --infodir=DIR info files directory [${infodir}]" + echo " --mandir=DIR man pages directory [${mandir}]" + echo " --sysconfdir=DIR read-only single-machine data directory [${sysconfdir}]" + echo " CC=COMPILER C compiler to use [gcc]" + echo " CXX=COMPILER C++ compiler to use [g++]" + echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" + echo " CFLAGS=OPTIONS command line options for the C compiler [${CFLAGS}]" + echo " CXXFLAGS=OPTIONS command line options for the C++ compiler [${CXXFLAGS}]" + echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]" + echo + exit 0 ;; + --version | --ve* | -V) + echo "Configure script for ${progname} version ${progversion}" + exit 0 ;; + --srcdir* | --sr*) + srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --prefix* | --pr*) + prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; + --exec-prefix* | --ex*) + exec_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; + --bindir* | --bi*) + bindir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --datadir* | --da*) + datadir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --infodir* | --in*) + infodir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --mandir* | --ma*) + mandir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --sysconfdir* | --sy*) + sysconfdir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --no-create | --no-c*) + no_create=yes ;; + + CC=*) CC=${optarg} ;; + CXX=*) CXX=${optarg} ;; + CPPFLAGS=*) CPPFLAGS=${optarg} ;; + CFLAGS=*) CFLAGS=${optarg} ;; + CXXFLAGS=*) CXXFLAGS=${optarg} ;; + LDFLAGS=*) LDFLAGS=${optarg} ;; + + --* | *=* | *-*-*) ;; + *) + echo "configure: Unrecognized option: \"${option}\"; use --help for usage." 1>&2 + exit 1 ;; + esac +done + +# Find the source files, if location was not specified. +srcdirtext= +if [ x"${srcdir}" = x ] ; then + srcdirtext="or . or .." ; srcdir=. + if [ ! -r ${srcdir}/${srctrigger} ] ; then srcdir=.. ; fi + if [ ! -r ${srcdir}/${srctrigger} ] ; then + ## the sed command below emulates the dirname command + srcdir=`echo $0 | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + fi +fi + +if [ ! -r ${srcdir}/${srctrigger} ] ; then + exec 1>&2 + echo + echo "configure: Can't find sources in ${srcdir} ${srcdirtext}" + echo "configure: (At least ${srctrigger} is missing)." + exit 1 +fi + +# Set srcdir to . if that's what it is. +if [ "`pwd`" = "`cd ${srcdir} ; pwd`" ] ; then srcdir=. ; fi + +# checking whether we are using GNU C. +if [ x"${CC}" = x ] ; then # Let the user override the test. + if [ -x /bin/gcc ] || + [ -x /usr/bin/gcc ] || + [ -x /usr/local/bin/gcc ] ; then + CC="gcc" + else + CC="cc" + fi +fi + +# checking whether we are using GNU C++. +if [ x"${CXX}" = x ] ; then # Let the user override the test. + if [ -x /bin/g++ ] || + [ -x /usr/bin/g++ ] || + [ -x /usr/local/bin/g++ ] ; then + CXX="g++" + else + CXX="c++" + fi +fi + +echo +if [ x${no_create} = x ] ; then + echo "creating config.status" + rm -f config.status + cat > config.status << EOF +#! /bin/sh +# This file was generated automatically by configure. Do not edit. +# Run this file to recreate the current configuration. +# +# This script is free software: you have unlimited permission +# to copy, distribute and modify it. + +exec /bin/sh $0 ${args} --no-create +EOF + chmod +x config.status +fi + +echo "creating Makefile" +echo "VPATH = ${srcdir}" +echo "prefix = ${prefix}" +echo "exec_prefix = ${exec_prefix}" +echo "bindir = ${bindir}" +echo "datadir = ${datadir}" +echo "infodir = ${infodir}" +echo "mandir = ${mandir}" +echo "sysconfdir = ${sysconfdir}" +echo "CC = ${CC}" +echo "CXX = ${CXX}" +echo "CPPFLAGS = ${CPPFLAGS}" +echo "CFLAGS = ${CFLAGS}" +echo "CXXFLAGS = ${CXXFLAGS}" +echo "LDFLAGS = ${LDFLAGS}" +rm -f Makefile +cat > Makefile << EOF +# Makefile for Plzip - A parallel version of the lzip data compressor +# Copyright (C) 2009 Antonio Diaz Diaz. +# This file was generated automatically by configure. Do not edit. +# +# This Makefile is free software: you have unlimited permission +# to copy, distribute and modify it. + +progname = ${progname} +progversion = ${progversion} +VPATH = ${srcdir} +prefix = ${prefix} +exec_prefix = ${exec_prefix} +bindir = ${bindir} +datadir = ${datadir} +infodir = ${infodir} +mandir = ${mandir} +sysconfdir = ${sysconfdir} +CC = ${CC} +CXX = ${CXX} +CPPFLAGS = ${CPPFLAGS} +CFLAGS = ${CFLAGS} +CXXFLAGS = ${CXXFLAGS} +LDFLAGS = ${LDFLAGS} +EOF +cat ${srcdir}/Makefile.in >> Makefile + +echo "OK. Now you can run make." diff --git a/doc/plzip.1 b/doc/plzip.1 new file mode 100644 index 0000000..4a812c0 --- /dev/null +++ b/doc/plzip.1 @@ -0,0 +1,71 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH PLZIP "1" "December 2009" "Plzip 0.1" "User Commands" +.SH NAME +Plzip \- data compressor based on the LZMA algorithm +.SH SYNOPSIS +.B plzip +[\fIoptions\fR] [\fIfiles\fR] +.SH DESCRIPTION +Plzip \- A parallel version of the lzip data compressor. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +display this help and exit +.TP +\fB\-V\fR, \fB\-\-version\fR +output version information and exit +.TP +\fB\-c\fR, \fB\-\-stdout\fR +send output to standard output +.TP +\fB\-d\fR, \fB\-\-decompress\fR +decompress +.TP +\fB\-n\fR, \fB\-\-threads=\fR<n> +set the number of (de)compression threads +.TP +\fB\-q\fR, \fB\-\-quiet\fR +suppress all messages +.TP +\fB\-t\fR, \fB\-\-test\fR +test compressed file integrity +.TP +\fB\-v\fR, \fB\-\-verbose\fR +be verbose (a 2nd \fB\-v\fR gives more) +.TP +\fB\-1\fR .. \fB\-9\fR +set compression level [default 6] +.TP +\fB\-\-fast\fR +alias for \fB\-1\fR +.TP +\fB\-\-best\fR +alias for \fB\-9\fR +.PP +If no file names are given, plzip compresses or decompresses +from standard input to standard output. +Numbers may be followed by a multiplier: k = kB = 10^3 = 1000, +Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc... +.SH "REPORTING BUGS" +Report bugs to lzip\-bug@nongnu.org +Lzip home page: http://www.nongnu.org/lzip/lzip.html +.SH COPYRIGHT +Copyright \(co 2009 Laszlo Ersek. +.br +Copyright \(co 2009 Antonio Diaz Diaz. +License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> +.br +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. +.SH "SEE ALSO" +The full documentation for +.B Plzip +is maintained as a Texinfo manual. If the +.B info +and +.B Plzip +programs are properly installed at your site, the command +.IP +.B info Plzip +.PP +should give you access to the complete manual. diff --git a/doc/plzip.info b/doc/plzip.info new file mode 100644 index 0000000..68fa5fa --- /dev/null +++ b/doc/plzip.info @@ -0,0 +1,303 @@ +This is plzip.info, produced by makeinfo version 4.13 from +plzip.texinfo. + +INFO-DIR-SECTION Data Compression +START-INFO-DIR-ENTRY +* Plzip: (plzip). Parallel version of the lzip data compressor +END-INFO-DIR-ENTRY + + +File: plzip.info, Node: Top, Next: Introduction, Up: (dir) + +Plzip Manual +************ + +This manual is for Plzip (version 0.1, 5 December 2009). + +* Menu: + +* Introduction:: Purpose and features of plzip +* Invoking Plzip:: Command line interface +* File Format:: Detailed format of the compressed file +* Problems:: Reporting bugs +* Concept Index:: Index of concepts + + + Copyright (C) 2008, 2009 Antonio Diaz Diaz. + + This manual is free documentation: you have unlimited permission to +copy, distribute and modify it. + + +File: plzip.info, Node: Introduction, Next: Invoking Plzip, Prev: Top, Up: Top + +1 Introduction +************** + +Plzip is a parallel version of the lzip data compressor. Currently only +compression is performed in parallel. Parallel decompression is planned +to be implemented soon. + + Lzip is a lossless data compressor based on the LZMA algorithm, with +very safe integrity checking and a user interface similar to the one of +gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses +better than bzip2, which makes it well suited for software distribution +and data archiving. + + Plzip replaces every file given in the command line with a compressed +version of itself, with the name "original_name.lz". Each compressed +file has the same modification date, permissions, and, when possible, +ownership as the corresponding original, so that these properties can be +correctly restored at decompression time. Plzip is able to read from +some types of non regular files if the `--stdout' option is specified. + + If no file names are specified, plzip compresses (or decompresses) +from standard input to standard output. In this case, plzip will +decline to write compressed output to a terminal, as this would be +entirely incomprehensible and therefore pointless. + + Plzip will correctly decompress a file which is the concatenation of +two or more compressed files. The result is the concatenation of the +corresponding uncompressed files. Integrity testing of concatenated +compressed files is also supported. + + When decompressing, plzip attempts to guess the name for the +decompressed file from that of the compressed file as follows: + +filename.lz becomes filename +filename.tlz becomes filename.tar +anyothername becomes anyothername.out + + As a self-check for your protection, plzip stores in the member +trailer the 32-bit CRC of the original data and the size of the +original data, to make sure that the decompressed version of the data +is identical to the original. This guards against corruption of the +compressed data, and against undetected bugs in plzip (hopefully very +unlikely). The chances of data corruption going undetected are +microscopic, less than one chance in 4000 million for each member +processed. Be aware, though, that the check occurs upon decompression, +so it can only tell you that something is wrong. It can't help you +recover the original uncompressed data. + + Return values: 0 for a normal exit, 1 for environmental problems +(file not found, invalid flags, I/O errors, etc), 2 to indicate a +corrupt or invalid input file, 3 for an internal consistency error (eg, +bug) which caused plzip to panic. + + +File: plzip.info, Node: Invoking Plzip, Next: File Format, Prev: Introduction, Up: Top + +2 Invoking Plzip +**************** + +The format for running plzip is: + + plzip [OPTIONS] [FILES] + + Plzip supports the following options: + +`--help' +`-h' + Print an informative help message describing the options and exit. + +`--version' +`-V' + Print the version number of plzip on the standard output and exit. + +`--stdout' +`-c' + Compress or decompress to standard output. Needed when reading + from a named pipe (fifo) or from a device. + +`--decompress' +`-d' + Decompress. + +`--force' +`-f' + Force overwrite of output file. + +`--keep' +`-k' + Keep (don't delete) input files during compression or + decompression. + +`--match-length=LENGTH' +`-m LENGTH' + Set the match length limit in bytes. Valid values range from 5 to + 273. Larger values usually give better compression ratios but + longer compression times. + +`--output=FILE' +`-o FILE' + When reading from standard input and `--stdout' has not been + specified, use `FILE' as the virtual name of the uncompressed + file. This produces a file named `FILE' when decompressing, and a + file named `FILE.lz' when compressing. + +`--quiet' +`-q' + Quiet operation. Suppress all messages. + +`--dictionary-size=SIZE' +`-s SIZE' + Set the dictionary size limit in bytes. Valid values range from + 4KiB to 512MiB. Note that dictionary sizes are quantized. If the + specified size does not match one of the valid sizes, it will be + rounded upwards. + +`--test' +`-t' + Check integrity of the specified file(s), but don't decompress + them. This really performs a trial decompression and throws away + the result. Use `-tvv' or `-tvvv' to see information about the + file. + +`--verbose' +`-v' + Verbose mode. Show the compression ratio for each file processed. + Further -v's increase the verbosity level. + +`-1 .. -9' + Set the compression parameters (dictionary size and match length + limit) as shown in the table below. Note that `-9' can be much + slower than `-1'. These options have no effect when decompressing. + + Level Dictionary size Match length limit + -1 1MiB 10 bytes + -2 1MiB 12 bytes + -3 1MiB 17 bytes + -4 2MiB 26 bytes + -5 4MiB 44 bytes + -6 8MiB 80 bytes + -7 16MiB 108 bytes + -8 16MiB 163 bytes + -9 32MiB 273 bytes + +`--fast' +`--best' + Aliases for GNU gzip compatibility. + + + + Numbers given as arguments to options may be followed by a multiplier +and an optional `B' for "byte". + + Table of SI and binary prefixes (unit multipliers): + +Prefix Value | Prefix Value +k kilobyte (10^3 = 1000) | Ki kibibyte (2^10 = 1024) +M megabyte (10^6) | Mi mebibyte (2^20) +G gigabyte (10^9) | Gi gibibyte (2^30) +T terabyte (10^12) | Ti tebibyte (2^40) +P petabyte (10^15) | Pi pebibyte (2^50) +E exabyte (10^18) | Ei exbibyte (2^60) +Z zettabyte (10^21) | Zi zebibyte (2^70) +Y yottabyte (10^24) | Yi yobibyte (2^80) + + +File: plzip.info, Node: File Format, Next: Problems, Prev: Invoking Plzip, Up: Top + +3 File Format +************* + +In the diagram below, a box like this: ++---+ +| | <-- the vertical bars might be missing ++---+ + + represents one byte; a box like this: ++==============+ +| | ++==============+ + + represents a variable number of bytes. + + + A lzip file consists of a series of "members" (compressed data sets). +The members simply appear one after another in the file, with no +additional information before, between, or after them. + + Each member has the following structure: ++--+--+--+--+----+----+=============+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| ID string | VN | DS | Lzma stream | CRC32 | Data size | Member size | ++--+--+--+--+----+----+=============+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + All multibyte values are stored in little endian order. + +`ID string' + A four byte string, identifying the member type, with the value + "LZIP". + +`VN (version number, 1 byte)' + Just in case something needs to be modified in the future. Valid + values are 0 and 1. Version 0 files have only one member and lack + `Member size'. + +`DS (coded dictionary size, 1 byte)' + Bits 4-0 contain the base 2 logarithm of the base dictionary size. + Bits 7-5 contain the number of "wedges" to substract from the base + dictionary size to obtain the dictionary size. The size of a wedge + is (base dictionary size / 16). + Valid values for dictionary size range from 4KiB to 512MiB. + +`Lzma stream' + The lzma stream, finished by an end of stream marker. Uses default + values for encoder properties. + +`CRC32 (4 bytes)' + CRC of the uncompressed original data. + +`Data size (8 bytes)' + Size of the uncompressed original data. + +`Member size (8 bytes)' + Total size of the member, including header and trailer. This + facilitates safe recovery of undamaged members from multimember + files. + + + +File: plzip.info, Node: Problems, Next: Concept Index, Prev: File Format, Up: Top + +4 Reporting Bugs +**************** + +There are probably bugs in plzip. There are certainly errors and +omissions in this manual. If you report them, they will get fixed. If +you don't, no one will ever know about them and they will remain unfixed +for all eternity, if not longer. + + If you find a bug in plzip, please send electronic mail to +<lzip-bug@nongnu.org>. Include the version number, which you can find +by running `plzip --version'. + + +File: plzip.info, Node: Concept Index, Prev: Problems, Up: Top + +Concept Index +************* + + +* Menu: + +* bugs: Problems. (line 6) +* file format: File Format. (line 6) +* getting help: Problems. (line 6) +* introduction: Introduction. (line 6) +* invoking: Invoking Plzip. (line 6) +* options: Invoking Plzip. (line 6) +* usage: Invoking Plzip. (line 6) +* version: Invoking Plzip. (line 6) + + + +Tag Table: +Node: Top227 +Node: Introduction750 +Node: Invoking Plzip3401 +Node: File Format6746 +Node: Problems8702 +Node: Concept Index9231 + +End Tag Table diff --git a/doc/plzip.texinfo b/doc/plzip.texinfo new file mode 100644 index 0000000..78ccce5 --- /dev/null +++ b/doc/plzip.texinfo @@ -0,0 +1,311 @@ +\input texinfo @c -*-texinfo-*- +@c %**start of header +@setfilename plzip.info +@settitle Plzip Manual +@finalout +@c %**end of header + +@set UPDATED 5 December 2009 +@set VERSION 0.1 + +@dircategory Data Compression +@direntry +* Plzip: (plzip). Parallel version of the lzip data compressor +@end direntry + + +@titlepage +@title Plzip +@subtitle A data compressor based on the LZMA algorithm +@subtitle for Plzip version @value{VERSION}, @value{UPDATED} +@author by Antonio Diaz Diaz + +@page +@vskip 0pt plus 1filll +@end titlepage + +@contents + +@node Top +@top + +This manual is for Plzip (version @value{VERSION}, @value{UPDATED}). + +@menu +* Introduction:: Purpose and features of plzip +* Invoking Plzip:: Command line interface +* File Format:: Detailed format of the compressed file +* Problems:: Reporting bugs +* Concept Index:: Index of concepts +@end menu + +@sp 1 +Copyright @copyright{} 2008, 2009 Antonio Diaz Diaz. + +This manual is free documentation: you have unlimited permission +to copy, distribute and modify it. + + +@node Introduction +@chapter Introduction +@cindex introduction + +Plzip is a parallel version of the lzip data compressor. Currently only +compression is performed in parallel. Parallel decompression is planned +to be implemented soon. + +Lzip is a lossless data compressor based on the LZMA algorithm, with +very safe integrity checking and a user interface similar to the one of +gzip or bzip2. Lzip decompresses almost as fast as gzip and compresses +better than bzip2, which makes it well suited for software distribution +and data archiving. + +Plzip replaces every file given in the command line with a compressed +version of itself, with the name "original_name.lz". Each compressed +file has the same modification date, permissions, and, when possible, +ownership as the corresponding original, so that these properties can be +correctly restored at decompression time. Plzip is able to read from some +types of non regular files if the @samp{--stdout} option is specified. + +If no file names are specified, plzip compresses (or decompresses) from +standard input to standard output. In this case, plzip will decline to +write compressed output to a terminal, as this would be entirely +incomprehensible and therefore pointless. + +Plzip will correctly decompress a file which is the concatenation of two +or more compressed files. The result is the concatenation of the +corresponding uncompressed files. Integrity testing of concatenated +compressed files is also supported. + +When decompressing, plzip attempts to guess the name for the decompressed +file from that of the compressed file as follows: + +@multitable {anyothername} {becomes} {anyothername.out} +@item filename.lz @tab becomes @tab filename +@item filename.tlz @tab becomes @tab filename.tar +@item anyothername @tab becomes @tab anyothername.out +@end multitable + +As a self-check for your protection, plzip stores in the member trailer +the 32-bit CRC of the original data and the size of the original data, +to make sure that the decompressed version of the data is identical to +the original. This guards against corruption of the compressed data, and +against undetected bugs in plzip (hopefully very unlikely). The chances +of data corruption going undetected are microscopic, less than one +chance in 4000 million for each member processed. Be aware, though, that +the check occurs upon decompression, so it can only tell you that +something is wrong. It can't help you recover the original uncompressed +data. + +Return values: 0 for a normal exit, 1 for environmental problems (file +not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or +invalid input file, 3 for an internal consistency error (eg, bug) which +caused plzip to panic. + + +@node Invoking Plzip +@chapter Invoking Plzip +@cindex invoking +@cindex options +@cindex usage +@cindex version + +The format for running plzip is: + +@example +plzip [@var{options}] [@var{files}] +@end example + +Plzip supports the following options: + +@table @samp +@item --help +@itemx -h +Print an informative help message describing the options and exit. + +@item --version +@itemx -V +Print the version number of plzip on the standard output and exit. + +@item --stdout +@itemx -c +Compress or decompress to standard output. Needed when reading from a +named pipe (fifo) or from a device. + +@item --decompress +@itemx -d +Decompress. + +@item --force +@itemx -f +Force overwrite of output file. + +@item --keep +@itemx -k +Keep (don't delete) input files during compression or decompression. + +@item --match-length=@var{length} +@itemx -m @var{length} +Set the match length limit in bytes. Valid values range from 5 to 273. +Larger values usually give better compression ratios but longer +compression times. + +@item --output=@var{file} +@itemx -o @var{file} +When reading from standard input and @samp{--stdout} has not been +specified, use @samp{@var{file}} as the virtual name of the uncompressed +file. This produces a file named @samp{@var{file}} when decompressing, +and a file named @samp{@var{file}.lz} when compressing. + +@item --quiet +@itemx -q +Quiet operation. Suppress all messages. + +@item --dictionary-size=@var{size} +@itemx -s @var{size} +Set the dictionary size limit in bytes. Valid values range from 4KiB to +512MiB. Note that dictionary sizes are quantized. If the specified size +does not match one of the valid sizes, it will be rounded upwards. + +@item --test +@itemx -t +Check integrity of the specified file(s), but don't decompress them. +This really performs a trial decompression and throws away the result. +Use @samp{-tvv} or @samp{-tvvv} to see information about the file. + +@item --verbose +@itemx -v +Verbose mode. Show the compression ratio for each file processed. +Further -v's increase the verbosity level. + +@item -1 .. -9 +Set the compression parameters (dictionary size and match length limit) +as shown in the table below. Note that @samp{-9} can be much slower than +@samp{-1}. These options have no effect when decompressing. + +@multitable {Level} {Dictionary size} {Match length limit} +@item Level @tab Dictionary size @tab Match length limit +@item -1 @tab 1MiB @tab 10 bytes +@item -2 @tab 1MiB @tab 12 bytes +@item -3 @tab 1MiB @tab 17 bytes +@item -4 @tab 2MiB @tab 26 bytes +@item -5 @tab 4MiB @tab 44 bytes +@item -6 @tab 8MiB @tab 80 bytes +@item -7 @tab 16MiB @tab 108 bytes +@item -8 @tab 16MiB @tab 163 bytes +@item -9 @tab 32MiB @tab 273 bytes +@end multitable + +@item --fast +@itemx --best +Aliases for GNU gzip compatibility. + +@end table + +@sp 1 +Numbers given as arguments to options may be followed by a multiplier +and an optional @samp{B} for "byte". + +Table of SI and binary prefixes (unit multipliers): + +@multitable {Prefix} {kilobyte (10^3 = 1000)} {|} {Prefix} {kibibyte (2^10 = 1024)} +@item Prefix @tab Value @tab | @tab Prefix @tab Value +@item k @tab kilobyte (10^3 = 1000) @tab | @tab Ki @tab kibibyte (2^10 = 1024) +@item M @tab megabyte (10^6) @tab | @tab Mi @tab mebibyte (2^20) +@item G @tab gigabyte (10^9) @tab | @tab Gi @tab gibibyte (2^30) +@item T @tab terabyte (10^12) @tab | @tab Ti @tab tebibyte (2^40) +@item P @tab petabyte (10^15) @tab | @tab Pi @tab pebibyte (2^50) +@item E @tab exabyte (10^18) @tab | @tab Ei @tab exbibyte (2^60) +@item Z @tab zettabyte (10^21) @tab | @tab Zi @tab zebibyte (2^70) +@item Y @tab yottabyte (10^24) @tab | @tab Yi @tab yobibyte (2^80) +@end multitable + + +@node File Format +@chapter File Format +@cindex file format + +In the diagram below, a box like this: +@verbatim ++---+ +| | <-- the vertical bars might be missing ++---+ +@end verbatim + +represents one byte; a box like this: +@verbatim ++==============+ +| | ++==============+ +@end verbatim + +represents a variable number of bytes. + +@sp 1 +A lzip file consists of a series of "members" (compressed data sets). +The members simply appear one after another in the file, with no +additional information before, between, or after them. + +Each member has the following structure: +@verbatim ++--+--+--+--+----+----+=============+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| ID string | VN | DS | Lzma stream | CRC32 | Data size | Member size | ++--+--+--+--+----+----+=============+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +@end verbatim + +All multibyte values are stored in little endian order. + +@table @samp +@item ID string +A four byte string, identifying the member type, with the value "LZIP". + +@item VN (version number, 1 byte) +Just in case something needs to be modified in the future. Valid values +are 0 and 1. Version 0 files have only one member and lack @samp{Member +size}. + +@item DS (coded dictionary size, 1 byte) +Bits 4-0 contain the base 2 logarithm of the base dictionary size.@* +Bits 7-5 contain the number of "wedges" to substract from the base +dictionary size to obtain the dictionary size. The size of a wedge is +(base dictionary size / 16).@* +Valid values for dictionary size range from 4KiB to 512MiB. + +@item Lzma stream +The lzma stream, finished by an end of stream marker. Uses default values +for encoder properties. + +@item CRC32 (4 bytes) +CRC of the uncompressed original data. + +@item Data size (8 bytes) +Size of the uncompressed original data. + +@item Member size (8 bytes) +Total size of the member, including header and trailer. This facilitates +safe recovery of undamaged members from multimember files. + +@end table + + +@node Problems +@chapter Reporting Bugs +@cindex bugs +@cindex getting help + +There are probably bugs in plzip. There are certainly errors and +omissions in this manual. If you report them, they will get fixed. If +you don't, no one will ever know about them and they will remain unfixed +for all eternity, if not longer. + +If you find a bug in plzip, please send electronic mail to +@email{lzip-bug@@nongnu.org}. Include the version number, which you can +find by running @w{@samp{plzip --version}}. + + +@node Concept Index +@unnumbered Concept Index + +@printindex cp + +@bye diff --git a/lacos_rbtree.cc b/lacos_rbtree.cc new file mode 100644 index 0000000..14404c0 --- /dev/null +++ b/lacos_rbtree.cc @@ -0,0 +1,418 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +#define _FILE_OFFSET_BITS 64 + +#include <cstddef> + +#include "lacos_rbtree.h" + + +enum lacos_rbtree_color { + LACOS_RBTREE_RED, + LACOS_RBTREE_BLACK +}; + +struct lacos_rbtree_node { + void *data; + lacos_rbtree_node *parent, + *left, + *right; + lacos_rbtree_color color; +}; + + +lacos_rbtree_node * +lacos_rbtree_find( lacos_rbtree_node *root, const void *key, + int (*cmp)(const void *cmp_key, const void *cmp_data)) +{ + int cmp_res; + while (root && (cmp_res = (*cmp)(key, root->data))) + root = cmp_res < 0 ? root->left : root->right; + return root; +} + + +lacos_rbtree_node * +lacos_rbtree_min( lacos_rbtree_node *root) +{ + lacos_rbtree_node *tmp; + + if (!root) + return 0; + + while ((tmp = root->left)) + root = tmp; + + return root; +} + + +lacos_rbtree_node * +lacos_rbtree_max( lacos_rbtree_node *root) +{ + lacos_rbtree_node *tmp; + + if (!root) + return 0; + + while ((tmp = root->right)) + root = tmp; + + return root; +} + + +lacos_rbtree_node * +lacos_rbtree_next( lacos_rbtree_node *current) +{ + lacos_rbtree_node *tmp; + + if (!current) + return 0; + + if ((tmp = current->right)) { + while ((current = tmp->left)) + tmp = current; + return tmp; + } + + while ((tmp = current->parent) && current == tmp->right) + current = tmp; + + return tmp; +} + + +lacos_rbtree_node * +lacos_rbtree_prev( lacos_rbtree_node *current) +{ + lacos_rbtree_node *tmp; + + if (!current) + return 0; + + if ((tmp = current->left)) { + while ((current = tmp->right)) + tmp = current; + return tmp; + } + + while ((tmp = current->parent) && current == tmp->left) + current = tmp; + + return tmp; +} + + +static void +lacos_rbtree_rotate_left( lacos_rbtree_node **new_root, + lacos_rbtree_node *rotation_root) +{ + lacos_rbtree_node + *parent = rotation_root->parent, + *rc = rotation_root->right, + *rlc = rc->left; + + rotation_root->right = rlc; + if (rlc) + rlc->parent = rotation_root; + rc->parent = parent; + if (parent) + if (rotation_root == parent->left) + parent->left = rc; + else + parent->right = rc; + else + *new_root = rc; + rc->left = rotation_root; + rotation_root->parent = rc; +} + + +static void +lacos_rbtree_rotate_right( lacos_rbtree_node **new_root, + lacos_rbtree_node *rotation_root) +{ + lacos_rbtree_node + *parent = rotation_root->parent, + *lc = rotation_root->left, + *lrc = lc->right; + + rotation_root->left = lrc; + if (lrc) + lrc->parent = rotation_root; + lc->parent = parent; + if (parent) + if (rotation_root == parent->left) + parent->left = lc; + else + parent->right = lc; + else + *new_root = lc; + lc->right = rotation_root; + rotation_root->parent = lc; +} + + +int +lacos_rbtree_insert( lacos_rbtree_node **new_root, + lacos_rbtree_node **new_node, void *new_data, + int (*cmp)(const void *cmp_new_data, const void *cmp_data), + void *(*alloc)(size_t size, void *alloc_ctl), void *alloc_ctl) +{ + int cmp_res = 0; + lacos_rbtree_node *tmp = *new_root, *parent = 0; + + while (tmp && (cmp_res = (*cmp)(new_data, tmp->data))) { + parent = tmp; + tmp = cmp_res < 0 ? tmp->left : tmp->right; + } + + if (tmp) { + *new_node = tmp; + return -1; + } + + if (!(*new_node = tmp = (lacos_rbtree_node *)(*alloc)(sizeof(lacos_rbtree_node), + alloc_ctl))) + return -1; + + tmp->data = new_data; + tmp->parent = parent; + tmp->left = 0; + tmp->right = 0; + if (parent) + if (cmp_res < 0) + parent->left = tmp; + else + parent->right = tmp; + else { + *new_root = tmp; + tmp->color = LACOS_RBTREE_BLACK; + return 0; + } + + { + lacos_rbtree_node *root = *new_root, *grandparent, *uncle; + + tmp->color = LACOS_RBTREE_RED; + + while (tmp != root && LACOS_RBTREE_RED == parent->color) { + grandparent = parent->parent; + if (parent == grandparent->left) { + uncle = grandparent->right; + if (uncle && LACOS_RBTREE_RED == uncle->color) { + parent->color = LACOS_RBTREE_BLACK; + uncle->color = LACOS_RBTREE_BLACK; + grandparent->color = LACOS_RBTREE_RED; + tmp = grandparent; + parent = tmp->parent; + } + else { + if (tmp == parent->right) { + tmp = parent; + lacos_rbtree_rotate_left(&root, tmp); + parent = tmp->parent; + grandparent = parent->parent; + } + parent->color = LACOS_RBTREE_BLACK; + grandparent->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_right(&root, grandparent); + } + } + else { + uncle = grandparent->left; + if (uncle && LACOS_RBTREE_RED == uncle->color) { + parent->color = LACOS_RBTREE_BLACK; + uncle->color = LACOS_RBTREE_BLACK; + grandparent->color = LACOS_RBTREE_RED; + tmp = grandparent; + parent = tmp->parent; + } + else { + if (tmp == parent->left) { + tmp = parent; + lacos_rbtree_rotate_right(&root, tmp); + parent = tmp->parent; + grandparent = parent->parent; + } + parent->color = LACOS_RBTREE_BLACK; + grandparent->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_left(&root, grandparent); + } + } + } + + root->color = LACOS_RBTREE_BLACK; + *new_root = root; + } + return 0; +} + + +void +lacos_rbtree_delete( lacos_rbtree_node **new_root, + lacos_rbtree_node *old_node, void **old_data, + void (*dealloc)(void *ptr, void *alloc_ctl), void *alloc_ctl) +{ + lacos_rbtree_node *child, *parent, *root = *new_root, + *old_node_left = old_node->left, + *old_node_right = old_node->right, + *old_node_parent = old_node->parent; + lacos_rbtree_color color_of_firstly_unlinked; + + if (old_data) + *old_data = old_node->data; + + if (old_node_left && old_node_right) { + lacos_rbtree_node + *to_relink = old_node_right, + *tmp = to_relink->left; + + if (tmp) { + do { + to_relink = tmp; + tmp = tmp->left; + } while (tmp); + parent = to_relink->parent; + child = to_relink->right; + parent->left = child; + if (child) + child->parent = parent; + to_relink->right = old_node_right; + old_node_right->parent = to_relink; + } + else { + parent = old_node_right; + child = old_node_right->right; + } + + to_relink->left = old_node_left; + old_node_left->parent = to_relink; + + color_of_firstly_unlinked = to_relink->color; + to_relink->color = old_node->color; + + to_relink->parent = old_node_parent; + + if (old_node_parent) + if (old_node == old_node_parent->left) + old_node_parent->left = to_relink; + else + old_node_parent->right = to_relink; + else + root = to_relink; + } + else { + parent = old_node_parent; + child = old_node_left ? old_node_left : old_node_right; + color_of_firstly_unlinked = old_node->color; + + if (child) + child->parent = parent; + if (old_node_parent) + if (old_node == old_node_parent->left) + old_node_parent->left = child; + else + old_node_parent->right = child; + else + root = child; + } + + (*dealloc)(old_node, alloc_ctl); + + if (LACOS_RBTREE_BLACK == color_of_firstly_unlinked) { + lacos_rbtree_node *brother, *left_nephew, *right_nephew; + int left_black, right_black; + + while (child != root && (!child || LACOS_RBTREE_BLACK == child->color)) + if (child == parent->left) { + brother = parent->right; + if (LACOS_RBTREE_RED == brother->color) { + brother->color = LACOS_RBTREE_BLACK; + parent->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_left(&root, parent); + brother = parent->right; + } + left_nephew = brother->left; + right_nephew = brother->right; + right_black = !right_nephew + || LACOS_RBTREE_BLACK == right_nephew->color; + if ((!left_nephew || LACOS_RBTREE_BLACK == left_nephew->color) + && right_black) { + brother->color = LACOS_RBTREE_RED; + child = parent; + parent = parent->parent; + } + else { + if (right_black) { + left_nephew->color = LACOS_RBTREE_BLACK; + brother->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_right(&root, brother); + brother = parent->right; + right_nephew = brother->right; + } + brother->color = parent->color; + parent->color = LACOS_RBTREE_BLACK; + right_nephew->color = LACOS_RBTREE_BLACK; + lacos_rbtree_rotate_left(&root, parent); + child = root; + break; + } + } + else { + brother = parent->left; + if (LACOS_RBTREE_RED == brother->color) { + brother->color = LACOS_RBTREE_BLACK; + parent->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_right(&root, parent); + brother = parent->left; + } + right_nephew = brother->right; + left_nephew = brother->left; + left_black = !left_nephew || LACOS_RBTREE_BLACK == left_nephew->color; + if ((!right_nephew || LACOS_RBTREE_BLACK == right_nephew->color) + && left_black) { + brother->color = LACOS_RBTREE_RED; + child = parent; + parent = parent->parent; + } + else { + if (left_black) { + right_nephew->color = LACOS_RBTREE_BLACK; + brother->color = LACOS_RBTREE_RED; + lacos_rbtree_rotate_left(&root, brother); + brother = parent->left; + left_nephew = brother->left; + } + brother->color = parent->color; + parent->color = LACOS_RBTREE_BLACK; + left_nephew->color = LACOS_RBTREE_BLACK; + lacos_rbtree_rotate_right(&root, parent); + child = root; + break; + } + } + + if (child) + child->color = LACOS_RBTREE_BLACK; + } + + *new_root = root; +} diff --git a/lacos_rbtree.h b/lacos_rbtree.h new file mode 100644 index 0000000..1945233 --- /dev/null +++ b/lacos_rbtree.h @@ -0,0 +1,249 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +#ifdef __cplusplus +extern "C" { +#endif + + +struct lacos_rbtree_node; +/* + Opaque data type for red-black binary tree nodes. To get its data pointer, + cast a (struct lacos_rbtree_node *) object to (void **) and derefer it once. + Empty trees equal to (struct lacos_rbtree_node *)0. + + This group of functions is generally not thread-safe (although it doesn't use + any static data), because the non-read-only operations must exclude all + operations on the same tree via external locking in a multi-threaded + environment. + + If you want to alter the (your own) "key" field in an element, you mustn't do + that in one step. It must involve one delete and one insert operation, in the + order of your choice. Delete-insert is probably faster than insert-delete. +*/ + + +/* + The functions below all return and mainly take pointers to nodes, not + elements (pointers to void). However, for simplicity of language, they are + described as if they operated on pointers to void (elements). +*/ + + +lacos_rbtree_node * +lacos_rbtree_find( lacos_rbtree_node *root, const void *key, + int (*cmp)(const void *cmp_key, const void *cmp_data)); +/* + USAGE: + Find an element in the tree. + + ARGUMENTS: + root: + Root of the tree. + + key: + This specifies which element should be found. This doesn't need to be an + element, it can be a standalone key too, if you write the "cmp" function + accordingly. + + cmp: + A function which should return an integer less than, equal to, or greater + than zero if the "key" argument compares less than, equal to, or greater + than the currently inspected element in the tree. + + RETURN VALUE: + If the key is found, this function returns the element (actually the + address of the containing node). If it is not found, 0 is returned. + + READ-ONLY OPERATION: + Yes. +*/ + + +lacos_rbtree_node * +lacos_rbtree_min( lacos_rbtree_node *root); +/* + USAGE: + Get the smallest element in the tree. + + ARGUMENTS: + root: + Root of the tree. + + RETURN VALUE: + If the tree is empty ("root" is null), 0 is returned. Otherwise, the + smallest element is returned. + + READ-ONLY OPERATION: + Yes. +*/ + + +lacos_rbtree_node * +lacos_rbtree_max( lacos_rbtree_node *root); +/* + USAGE: + Get the greatest element in the tree. + + ARGUMENTS: + root: + Root of the tree. + + RETURN VALUE: + If the tree is empty ("root" is null), 0 is returned. Otherwise, the + greatest element is returned. + + READ-ONLY OPERATION: + Yes. +*/ + + +lacos_rbtree_node * +lacos_rbtree_next( lacos_rbtree_node *current); +/* + USAGE: + Get the smallest element greater than "current". + + ARGUMENTS: + current: + An element. + + RETURN VALUE: + If "current" is null or the last element in the tree, 0 is returned. + Otherwise, the smallest element greater than "current" is returned. + + READ-ONLY OPERATION: + Yes. +*/ + + +lacos_rbtree_node * +lacos_rbtree_prev( lacos_rbtree_node *current); +/* + USAGE: + Get the greatest element smaller than "current". + + ARGUMENTS: + current: + An element. + + RETURN VALUE: + If "current" is null or the first element in the tree, 0 is returned. + Otherwise, the greatest element smaller than "current" is returned. + + READ-ONLY OPERATION: + Yes. +*/ + + +int +lacos_rbtree_insert( lacos_rbtree_node **new_root, + lacos_rbtree_node **new_node, void *new_data, + int (*cmp)(const void *cmp_new_data, const void *cmp_data), + void *(*alloc)(size_t size, void *alloc_ctl), void *alloc_ctl); +/* + USAGE: + Insert an element into the tree. + + ARGUMENTS: + new_root: + Address of the tree's root; "*new_root" is the root of the tree. Both + input and output. + + new_node: + Output only. + + new_data: + The data to insert. This must not be a standalone key, this must be a + full element. It will only be linked in, not copied. + + cmp: + A function which should return an integer less than, equal to, or greater + than zero if the "new_data" argument compares less than, equal to, or + greater than the currently inspected element in the tree. + + alloc: + A memory allocator function whose externally observable behavior is + consistent with that of "malloc". It must work together with the + "dealloc" function passed to "lacos_rbtree_delete". + + alloc_ctl: + A pointer to a custom data type to supply the "alloc" function with + optional auxiliary control information (arena etc). + + RETURN VALUE: + If the insertion succeeds, 0 is returned, the new element is stored into + "*new_node", and "*new_root" is updated to the new root of the tree. + + Otherwise, "*new_root" is not modified, and -1 is returned because of one + of the following errors: + + - An element with a colliding key was found in the tree. In this case, the + colliding element is stored into "*new_node". + - There was not enough memory to allocate a new node object. In this case, + 0 is stored into "*new_node". + + Existing node pointers remain valid in any case. + + READ-ONLY OPERATION: + No. +*/ + + +void +lacos_rbtree_delete( lacos_rbtree_node **new_root, + lacos_rbtree_node *old_node, void **old_data, + void (*dealloc)(void *ptr, void *alloc_ctl), void *alloc_ctl); +/* + USAGE: + Remove an element from the tree. + + ARGUMENTS: + new_root: + Address of the tree's root; "*new_root" is the root of the tree. Both + input and output. + + old_node: + The element to remove. This must be a valid node pointer into the tree. + + old_data: + The deleted element (the data of the deleted node, which was specified by + the "new_data" argument of the corresponding "lacos_rbtree_insert" call). + You could get the data also through "*(void **)old_node" before calling + this function. The data pointer of the node to delete is only accessed + and stored into "*old_data" if "old_data" is not 0. + + dealloc: + A memory deallocator function whose externally observable behavior is + consistent with that of "free". It must work together with the "alloc" + function passed to "lacos_rbtree_insert". + + alloc_ctl: + A pointer to a custom data type to supply the "dealloc" function with + optional auxiliary control information (arena etc). + + Existing node pointers different from "old_node" remain valid. + + READ-ONLY OPERATION: + No. +*/ + + +#ifdef __cplusplus +} +#endif @@ -0,0 +1,1300 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ +/* + Return values: 0 for a normal exit, 1 for environmental problems + (file not found, invalid flags, I/O errors, etc), 2 to indicate a + corrupt or invalid input file, 3 for an internal consistency error + (eg, bug) which caused plzip to panic. +*/ + +#define _FILE_OFFSET_BITS 64 + +#include <algorithm> +#include <cassert> +#include <cerrno> +#include <climits> +#include <csignal> +#include <cstdarg> /* va_list */ +#include <cstddef> +#include <cstdio> /* flockfile() */ +#include <cstdlib> +#include <cstring> /* strerror() */ +#include <string> +#include <vector> +#include <fcntl.h> /* open() */ +#include <stdint.h> +#include <pthread.h> +#include <unistd.h> +#include <utime.h> +#include <sys/stat.h> +#include <lzlib.h> + +#if CHAR_BIT != 8 +# error "Environments where CHAR_BIT != 8 are not supported." +#endif + +#include "arg_parser.h" +#include "main.h" +#include "plzip.h" + +#ifndef LLONG_MAX +#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL +#endif +#ifndef LLONG_MIN +#define LLONG_MIN (-LLONG_MAX - 1LL) +#endif +#ifndef ULLONG_MAX +#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL +#endif + +void internal_error( const char * msg ); +int readblock( const int fd, char * buf, const int size ) throw(); +int writeblock( const int fd, const char * buf, const int size ) throw(); + + +namespace { + +const char * invocation_name = 0; +const char * const Program_name = "Plzip"; +const char * const program_name = "plzip"; +const char * const program_year = "2009"; + +struct { const char * from; const char * to; } const known_extensions[] = { + { ".lz", "" }, + { ".tlz", ".tar" }, + { 0, 0 } }; + +struct lzma_options + { + int dictionary_size; // 4KiB..512MiB + int match_len_limit; // 5..273 + }; + +enum Mode { m_compress = 0, m_decompress, m_test }; + +std::string output_filename; +int outhandle = -1; +int verbosity = 0; +bool delete_output_on_interrupt = false; + +class Pretty_print + { + const char * const stdin_name; + const unsigned int stdin_name_len; + unsigned int longest_name; + std::string name_; + mutable bool first_post; + +public: + Pretty_print( const std::vector< std::string > & filenames ) + : stdin_name( "(stdin)" ), stdin_name_len( std::strlen( stdin_name ) ), + longest_name( 0 ), first_post( false ) + { + for( unsigned int i = 0; i < filenames.size(); ++i ) + { + const std::string & s = filenames[i]; + const unsigned int len = ( ( s == "-" ) ? stdin_name_len : s.size() ); + if( len > longest_name ) longest_name = len; + } + if( longest_name == 0 ) longest_name = stdin_name_len; + } + + void set_name( const std::string & filename ) + { + if( filename.size() && filename != "-" ) name_ = filename; + else name_ = stdin_name; + first_post = true; + } + + void reset() const throw() { if( name_.size() ) first_post = true; } + const char * name() const throw() { return name_.c_str(); } + void operator()( const char * const msg = 0 ) const throw(); + }; + + +void show_help() throw() + { + std::printf( "%s - A parallel version of the lzip data compressor.\n", Program_name ); + std::printf( "\nUsage: %s [options] [files]\n", invocation_name ); + std::printf( "\nOptions:\n" ); + std::printf( " -h, --help display this help and exit\n" ); + std::printf( " -V, --version output version information and exit\n" ); +// std::printf( " -b, --member-size=<n> set member size limit in bytes\n" ); + std::printf( " -c, --stdout send output to standard output\n" ); + std::printf( " -d, --decompress decompress\n" ); +// std::printf( " -f, --force overwrite existing output files\n" ); +// std::printf( " -k, --keep keep (don't delete) input files\n" ); +// std::printf( " -m, --match-length=<n> set match length limit in bytes [80]\n" ); + std::printf( " -n, --threads=<n> set the number of (de)compression threads\n" ); +// std::printf( " -o, --output=<file> if reading stdin, place the output into <file>\n" ); + std::printf( " -q, --quiet suppress all messages\n" ); +// std::printf( " -s, --dictionary-size=<n> set dictionary size limit in bytes [8MiB]\n" ); +// std::printf( " -S, --volume-size=<n> set volume size limit in bytes\n" ); + std::printf( " -t, --test test compressed file integrity\n" ); + std::printf( " -v, --verbose be verbose (a 2nd -v gives more)\n" ); + std::printf( " -1 .. -9 set compression level [default 6]\n" ); + std::printf( " --fast alias for -1\n" ); + std::printf( " --best alias for -9\n" ); + if( verbosity > 0 ) + { + std::printf( " -D, --debug=<level> (0-3) print debug statistics to stderr\n" ); + } + std::printf( "If no file names are given, %s compresses or decompresses\n", program_name ); + std::printf( "from standard input to standard output.\n" ); + std::printf( "Numbers may be followed by a multiplier: k = kB = 10^3 = 1000,\n" ); + std::printf( "Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc...\n" ); + std::printf( "\nReport bugs to lzip-bug@nongnu.org\n" ); + std::printf( "Lzip home page: http://www.nongnu.org/lzip/lzip.html\n" ); + } + + +void show_version() throw() + { + std::printf( "%s %s\n", Program_name, PROGVERSION ); + std::printf( "Copyright (C) 2009 Laszlo Ersek.\n" ); + std::printf( "Copyright (C) %s Antonio Diaz Diaz.\n", program_year ); + std::printf( "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n" ); + std::printf( "This is free software: you are free to change and redistribute it.\n" ); + std::printf( "There is NO WARRANTY, to the extent permitted by law.\n" ); + } + + +long long getnum( const char * ptr, const int bs = 0, + const long long llimit = LLONG_MIN + 1, + const long long ulimit = LLONG_MAX ) throw() + { + errno = 0; + char *tail; + long long result = strtoll( ptr, &tail, 0 ); + if( tail == ptr ) + { + show_error( "bad or missing numerical argument", 0, true ); + std::exit( 1 ); + } + + if( !errno && tail[0] ) + { + int factor = ( tail[1] == 'i' ) ? 1024 : 1000; + int exponent = 0; + bool bad_multiplier = false; + switch( tail[0] ) + { + case ' ': break; + case 'b': if( bs > 0 ) { factor = bs; exponent = 1; } + else bad_multiplier = true; + break; + case 'Y': exponent = 8; break; + case 'Z': exponent = 7; break; + case 'E': exponent = 6; break; + case 'P': exponent = 5; break; + case 'T': exponent = 4; break; + case 'G': exponent = 3; break; + case 'M': exponent = 2; break; + case 'K': if( factor == 1024 ) exponent = 1; else bad_multiplier = true; + break; + case 'k': if( factor == 1000 ) exponent = 1; else bad_multiplier = true; + break; + default: bad_multiplier = true; + } + if( bad_multiplier ) + { + show_error( "bad multiplier in numerical argument", 0, true ); + std::exit( 1 ); + } + for( int i = 0; i < exponent; ++i ) + { + if( LLONG_MAX / factor >= llabs( result ) ) result *= factor; + else { errno = ERANGE; break; } + } + } + if( !errno && ( result < llimit || result > ulimit ) ) errno = ERANGE; + if( errno ) + { + show_error( "numerical argument out of limits" ); + std::exit( 1 ); + } + return result; + } + + +int get_dict_size( const char * arg ) throw() + { + char *tail; + int bits = std::strtol( arg, &tail, 0 ); + if( bits >= min_dictionary_bits && bits <= max_dictionary_bits && *tail == 0 ) + return ( 1 << bits ); + return getnum( arg, 0, min_dictionary_size, max_dictionary_size ); + } + + +int extension_index( const std::string & name ) throw() + { + for( int i = 0; known_extensions[i].from; ++i ) + { + const std::string ext( known_extensions[i].from ); + if( name.size() > ext.size() && + name.compare( name.size() - ext.size(), ext.size(), ext ) == 0 ) + return i; + } + return -1; + } + + +int open_instream( const std::string & name, struct stat * in_statsp, + const Mode program_mode, const int eindex, + const bool force, const bool to_stdout ) throw() + { + int inhandle = -1; + if( program_mode == m_compress && !force && eindex >= 0 ) + { + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: input file `%s' already has `%s' suffix.\n", + program_name, name.c_str(), + known_extensions[eindex].from ); + } + else + { + inhandle = open( name.c_str(), O_RDONLY ); + if( inhandle < 0 ) + { + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: Can't open input file `%s': %s.\n", + program_name, name.c_str(), std::strerror( errno ) ); + } + else + { + const int i = fstat( inhandle, in_statsp ); + const mode_t & mode = in_statsp->st_mode; + if( i < 0 || !( S_ISREG( mode ) || ( to_stdout && + ( S_ISFIFO( mode ) || S_ISSOCK( mode ) || + S_ISBLK( mode ) || S_ISCHR( mode ) ) ) ) ) + { + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: input file `%s' is not a regular file%s.\n", + program_name, name.c_str(), + to_stdout ? "" : " and `--stdout' was not specified" ); + close( inhandle ); + inhandle = -1; + } + } + } + return inhandle; + } + + +void set_c_outname( const std::string & name ) throw() + { + output_filename = name; + output_filename += known_extensions[0].from; + } + + +void set_d_outname( const std::string & name, const int i ) throw() + { + if( i >= 0 ) + { + const std::string from( known_extensions[i].from ); + if( name.size() > from.size() ) + { + output_filename.assign( name, 0, name.size() - from.size() ); + output_filename += known_extensions[i].to; + return; + } + } + output_filename = name; output_filename += ".out"; + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: can't guess original name for `%s' -- using `%s'.\n", + program_name, name.c_str(), output_filename.c_str() ); + } + + +bool open_outstream( const bool force ) throw() + { + if( force ) + outhandle = open( output_filename.c_str(), O_CREAT | O_TRUNC | O_WRONLY, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ); + else outhandle = open( output_filename.c_str(), O_CREAT | O_EXCL | O_WRONLY, + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ); + if( outhandle < 0 ) + { + if( errno == EEXIST ) outhandle = -2; else outhandle = -1; + if( verbosity >= 0 ) + { + if( outhandle == -2 ) + std::fprintf( stderr, "%s: Output file %s already exists, skipping.\n", + program_name, output_filename.c_str() ); + else + std::fprintf( stderr, "%s: Can't create output file `%s': %s.\n", + program_name, output_filename.c_str(), std::strerror( errno ) ); + } + } + return ( outhandle >= 0 ); + } + + +bool check_tty( const int inhandle, const Mode program_mode ) throw() + { + if( program_mode == m_compress && isatty( outhandle ) ) + { + show_error( "I won't write compressed data to a terminal.", 0, true ); + return false; + } + if( ( program_mode == m_decompress || program_mode == m_test ) && + isatty( inhandle ) ) + { + show_error( "I won't read compressed data from a terminal.", 0, true ); + return false; + } + return true; + } + + +void cleanup_and_fail( const int retval ) throw() + { + if( delete_output_on_interrupt ) + { + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: Deleting output file `%s', if it exists.\n", + program_name, output_filename.c_str() ); + if( outhandle >= 0 ) { close( outhandle ); outhandle = -1; } + if( std::remove( output_filename.c_str() ) != 0 ) + show_error( "WARNING: deletion of output file (apparently) failed." ); + } + std::exit( retval ); + } + + + // Set permissions, owner and times. +void close_and_set_permissions( const struct stat * in_statsp, int * retvalp ) + { + int tmp = 0; + if( in_statsp ) + { + if( fchmod( outhandle, in_statsp->st_mode ) != 0 ) tmp = 1; + if( !tmp ) (void)fchown( outhandle, in_statsp->st_uid, in_statsp->st_gid ); + // fchown will in many cases return with EPERM, which can be safely ignored. + } + if( close( outhandle ) == 0 ) outhandle = -1; + else cleanup_and_fail( 1 ); + delete_output_on_interrupt = false; + if( !in_statsp ) return; + if( !tmp ) + { + struct utimbuf t; + t.actime = in_statsp->st_atime; + t.modtime = in_statsp->st_mtime; + if( utime( output_filename.c_str(), &t ) != 0 ) tmp = 1; + } + if( tmp ) + { + if( tmp > *retvalp ) *retvalp = tmp; + show_error( "I can't change output file attributes." ); + cleanup_and_fail( *retvalp ); + } + } + + +int decompress( const int inhandle, const Pretty_print & pp, + const bool testing ) + { + void * decoder = LZ_decompress_open(); + if( !decoder || LZ_decompress_errno( decoder ) != LZ_ok ) + { + LZ_decompress_close( decoder ); + pp( "not enough memory. Find a machine with more memory" ); + return 1; + } + if( verbosity >= 1 ) pp(); + + const int in_buffer_size = 65536, out_buffer_size = 8 * in_buffer_size; + uint8_t in_buffer[in_buffer_size], out_buffer[out_buffer_size]; + int in_pos = 0, in_stream_pos = 0; + bool finished = false; + while( true ) + { + int in_size = 0; + if( !finished ) + { + if( in_stream_pos == 0 ) + in_stream_pos = readblock( inhandle, (char *)in_buffer, in_buffer_size ); + if( in_pos < in_stream_pos ) + { + in_size = LZ_decompress_write( decoder, in_buffer + in_pos, in_stream_pos - in_pos ); + in_pos += in_size; + } + if( in_pos >= in_stream_pos ) + { + if( in_stream_pos < in_buffer_size ) + { finished = true; LZ_decompress_finish( decoder ); } + in_stream_pos = 0; in_pos = 0; + } + } + int out_size = LZ_decompress_read( decoder, out_buffer, out_buffer_size ); +// std::fprintf( stderr, "%5d in_size, %6d out_size.\n", in_size, out_size ); + if( out_size < 0 ) + { + const LZ_errno lz_errno = LZ_decompress_errno( decoder ); + if( lz_errno == LZ_header_error ) + { + if( LZ_decompress_total_out_size( decoder ) > 0 ) + break; // trailing garbage + pp( "error reading member header" ); + return 1; + } + if( lz_errno == LZ_mem_error ) + { + pp( "not enough memory. Find a machine with more memory" ); + return 1; + } + if( lz_errno == LZ_unexpected_eof ) + { + if( verbosity >= 0 ) + { pp(); + std::fprintf( stderr, "file ends unexpectedly at pos %lld\n", + LZ_decompress_total_in_size( decoder ) ); } + return 2; + } + pp(); show_error( "read error", errno ); return 1; + } + else if( out_size > 0 && outhandle >= 0 ) + { + const int wr = writeblock( outhandle, (char *)out_buffer, out_size ); + if( wr != out_size ) + { pp(); show_error( "write error", errno ); return 1; } + } + if( LZ_decompress_finished( decoder ) == 1 ) break; + if( finished && in_size == 0 && out_size == 0 ) + internal_error( "library error (LZ_decompress_read)" ); + } + if( verbosity >= 1 ) + { if( testing ) std::fprintf( stderr, "ok\n" ); + else std::fprintf( stderr, "done\n" ); } + LZ_decompress_close( decoder ); + return 0; + } + + +extern "C" void signal_handler( int ) throw() + { + show_error( "Control-C or similar caught, quitting." ); + cleanup_and_fail( 1 ); + } + + +void set_signals() throw() + { + signal( SIGHUP, signal_handler ); + signal( SIGINT, signal_handler ); + signal( SIGTERM, signal_handler ); + } + +} // end namespace + + +void Pretty_print::operator()( const char * const msg ) const throw() + { + if( verbosity >= 0 ) + { + if( first_post ) + { + first_post = false; + std::fprintf( stderr, " %s: ", name_.c_str() ); + for( unsigned int i = 0; i < longest_name - name_.size(); ++i ) + std::fprintf( stderr, " " ); + if( !msg ) std::fflush( stderr ); + } + if( msg ) std::fprintf( stderr, "%s.\n", msg ); + } + } + + +/* Private stuff needed by fatal(). */ +static pthread_t main_thread; + +static pid_t pid; + + +/* Public utility variables and functions. */ +void *(*mallocf)(size_t size); +void (*freef)(void *ptr); + + +/* + This can be called from any thread, main thread or sub-threads alike, since + they all call common helper functions that call fatal() in case of an error. +*/ +void +fatal(void) +{ + if( pthread_equal(pthread_self(), main_thread) ) + cleanup_and_fail( 1 ); + else + { + if (0 == kill(pid, SIGUSR1)) + pthread_exit(0); + } + _exit(EXIT_FAILURE); +} + + +void +fail(const char *fmt, int err, ...) +{ + va_list args; + + /* Locking stderr should also protect strerror(). */ + flockfile(stderr); + (void)fprintf(stderr, "%s: ", program_name); + + va_start(args, err); + (void)vfprintf(stderr, fmt, args); + va_end(args); + + (void)fprintf(stderr, ": %s\n", strerror(err)); + funlockfile(stderr); + /* Stream stderr is never fully buffered originally. */ + fatal(); +} + + +void * +xalloc(size_t size) +{ + void *ret = (*mallocf)(size); + + if (0 == ret) { + fail("(*mallocf)()", errno); + } + + return ret; +} + + +void +xinit(Cond *cond) +{ + int ret; + pthread_mutexattr_t attr; + + ret = pthread_mutexattr_init(&attr); + if (0 != ret) { + fail("pthread_mutexattr_init()", ret); + } + + ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + if (0 != ret) { + fail("pthread_mutexattr_settype()", ret); + } + + ret = pthread_mutex_init(&cond->lock, &attr); + if (0 != ret) { + fail("pthread_mutex_init()", ret); + } + + ret = pthread_mutexattr_destroy(&attr); + if (0 != ret) { + fail("pthread_mutexattr_destroy()", ret); + } + + ret = pthread_cond_init(&cond->cond, 0); + if (0 != ret) { + fail("pthread_cond_init()", ret); + } + + cond->ccount = 0lu; + cond->wcount = 0lu; +} + + +void +xdestroy(Cond *cond) +{ + int ret; + + ret = pthread_cond_destroy(&cond->cond); + if (0 != ret) { + fail("pthread_cond_destroy()", ret); + } + + ret = pthread_mutex_destroy(&cond->lock); + if (0 != ret) { + fail("pthread_mutex_destroy()", ret); + } +} + + +void +xlock(Cond *cond) +{ + int ret; + + ret = pthread_mutex_lock(&cond->lock); + if (0 != ret) { + fail("pthread_mutex_lock()", ret); + } +} + + +void +xlock_pred(Cond *cond) +{ + xlock(cond); + ++cond->ccount; +} + + +void +xunlock(Cond *cond) +{ + int ret; + + ret = pthread_mutex_unlock(&cond->lock); + if (0 != ret) { + fail("pthread_mutex_unlock()", ret); + } +} + + +void +xwait(Cond *cond) +{ + int ret; + + ++cond->wcount; + ret = pthread_cond_wait(&cond->cond, &cond->lock); + if (0 != ret) { + fail("pthread_cond_wait()", ret); + } + ++cond->ccount; +} + + +void +xsignal(Cond *cond) +{ + int ret; + + ret = pthread_cond_signal(&cond->cond); + if (0 != ret) { + fail("pthread_cond_signal()", ret); + } +} + + +void +xbroadcast(Cond *cond) +{ + int ret; + + ret = pthread_cond_broadcast(&cond->cond); + if (0 != ret) { + fail("pthread_cond_broadcast()", ret); + } +} + + +void +xcreate(pthread_t *thread, void *(*routine)(void *), void *arg) +{ + int ret; + + ret = pthread_create(thread, 0, routine, arg); + if (0 != ret) { + fail("pthread_create()", ret); + } +} + + +void +xjoin(pthread_t thread) +{ + int ret; + + ret = pthread_join(thread, 0); + if (0 != ret) { + fail("pthread_join()", ret); + } +} + + +void +xraise(int sig) +{ + if (-1 == kill(pid, sig)) { + fail("kill()", errno); + } +} + + +/* Private stuff part 2. */ + +struct Opts +{ + unsigned num_worker; /* Start this many worker threads. */ + unsigned clidx; /* Compression level index in [0u .. 8u]. */ + int print_cctrs; /* Print condition variable counters. */ +}; + +/* Backlog factor for all workers together. */ +static const unsigned blf = 3u; + +/* Separator characters in environment variable values. No escaping. */ +static const char envsep[] = " \t"; + + +static void * +trace_malloc(size_t size) +{ + void *ret; + int save_errno = 0; + + ret = malloc(size); + if (0 == ret) { + save_errno = errno; + } + + if (0 > fprintf(stderr, "%lu: malloc(%lu) == %p\n", (long unsigned)pid, + (long unsigned)size, ret) + ) { + fatal(); + } + + if (0 == ret) { + errno = save_errno; + } + + return ret; +} + + +static void +trace_free(void *ptr) +{ + if (0 > fprintf(stderr, "%lu: free(%p)\n", (long unsigned)pid, ptr)) { + fatal(); + } + free(ptr); +} + + +static void +xsigemptyset(sigset_t *set) +{ + if (-1 == sigemptyset(set)) { + fail("sigemptyset()", errno); + } +} + + +static void +xsigaddset(sigset_t *set, int signo) +{ + if (-1 == sigaddset(set, signo)) { + fail("sigaddset()", errno); + } +} + + +static void +xsigmask(int how, const sigset_t *set, sigset_t *oset) +{ + int ret; + + ret = pthread_sigmask(how, set, oset); + if (0 != ret) { + fail("pthread_sigmask()", ret); + } +} + + +static void +xsigaction(int sig, void (*handler)(int)) +{ + struct sigaction act; + + act.sa_handler = handler; + xsigemptyset(&act.sa_mask); + act.sa_flags = 0; + + if (-1 == sigaction(sig, &act, 0)) { + fail("sigaction()", errno); + } +} + + +enum caught_sig +{ + CS_INT = 1, + CS_TERM, + CS_USR1, + CS_USR2 +}; + +static volatile sig_atomic_t caught_sig; + + +static void +sighandler(int sig) +{ + /* sig_atomic_t is nowhere required to be able to hold signal values. */ + switch (sig) { + case SIGINT: + caught_sig = CS_INT; + break; + + case SIGTERM: + caught_sig = CS_TERM; + break; + + case SIGUSR1: + caught_sig = CS_USR1; + break; + + case SIGUSR2: + caught_sig = CS_USR2; + break; + + default: + assert(0); + } +} + + +static void +process( const Opts *opts, unsigned num_slot, + int infd, int outfd, const Pretty_print & pp, const sigset_t *unblocked ) +{ + /* + We could wait for signals with either sigwait() or sigsuspend(). SUSv2 + states about sigwait() that its effect on signal actions is unspecified. + SUSv3 still claims the same. + + The SUSv2 description of sigsuspend() talks about both the thread and the + whole process being suspended until a signal arrives, although thread + suspension seems much more likely from the wording. They note that they + filed a clarification request for this. SUSv3 cleans this up and chooses + thread suspension which was more logical anyway. + + I favor sigsuspend() because I need to re-raise SIGTERM and SIGINT, and + unspecified action behavior with sigwait() seems messy. + + 13-OCT-2009 lacos + */ + + Plzip_arg muxer_arg; + pthread_t muxer; + + if( verbosity >= 1 ) pp( "" ); + + muxer_arg.num_worker = opts->num_worker; + muxer_arg.num_slot = num_slot; + muxer_arg.clidx = opts->clidx; + muxer_arg.print_cctrs = opts->print_cctrs; + muxer_arg.infd = infd; + muxer_arg.outfd = outfd; + xcreate(&muxer, plzip_wrap, &muxer_arg); + + /* Unblock signals, wait for them, then block them again. */ + { + int ret = sigsuspend(unblocked); + assert(-1 == ret && EINTR == errno); + } + + switch (caught_sig) { + case CS_INT: + case CS_TERM: // FIXME remove output file + { + int sig; + sigset_t mask; + + sig = (CS_INT == caught_sig) ? SIGINT : SIGTERM; + /* + We might have inherited a SIG_IGN from the parent, but that would + make no sense here. 24-OCT-2009 lacos + */ + xsigaction(sig, SIG_DFL); + xraise(sig); + + xsigemptyset(&mask); + xsigaddset(&mask, sig); + xsigmask(SIG_UNBLOCK, &mask, 0); + } + /* + We shouldn't reach this point, but if we do for some reason, fall + through. + */ + + case CS_USR1: + /* Error from a non-main thread via fatal(). */ + fatal(); + + case CS_USR2: + /* Muxer thread joined other sub-threads and finished successfully. */ + break; + + default: + assert(0); + } + + xjoin(muxer); +} + + +static void +sigs_mod(int block_n_catch, sigset_t *oset) +{ + void (*handler)(int); + + if (block_n_catch) { + sigset_t mask; + + xsigemptyset(&mask); + xsigaddset(&mask, SIGINT); + xsigaddset(&mask, SIGTERM); + xsigaddset(&mask, SIGUSR1); + xsigaddset(&mask, SIGUSR2); + xsigmask(SIG_BLOCK, &mask, oset); + + handler = sighandler; + } + else { + handler = SIG_DFL; + } + + xsigaction(SIGINT, handler); + xsigaction(SIGTERM, handler); + xsigaction(SIGUSR1, handler); + xsigaction(SIGUSR2, handler); + + if (!block_n_catch) { + xsigmask(SIG_SETMASK, oset, 0); + } +} + + +void show_error( const char * msg, const int errcode, const bool help ) throw() + { + if( verbosity >= 0 ) + { + if( msg && msg[0] != 0 ) + { + std::fprintf( stderr, "%s: %s", program_name, msg ); + if( errcode > 0 ) std::fprintf( stderr, ": %s", std::strerror( errcode ) ); + std::fprintf( stderr, "\n" ); + } + if( help && invocation_name && invocation_name[0] != 0 ) + std::fprintf( stderr, "Try `%s --help' for more information.\n", invocation_name ); + } + } + + +void internal_error( const char * msg ) + { + std::string s( "internal error: " ); s += msg; + show_error( s.c_str() ); + std::exit( 3 ); + } + + +// Returns the number of bytes really read. +// If (returned value < size) and (errno == 0), means EOF was reached. +// +int readblock( const int fd, char * buf, const int size ) throw() + { + int rest = size; + errno = 0; + while( rest > 0 ) + { + errno = 0; + const int n = read( fd, buf + size - rest, rest ); + if( n > 0 ) rest -= n; + else if( n == 0 ) break; + else if( errno != EINTR && errno != EAGAIN ) break; + } + return ( rest > 0 ) ? size - rest : size; + } + + +// Returns the number of bytes really written. +// If (returned value < size), it is always an error. +// +int writeblock( const int fd, const char * buf, const int size ) throw() + { + int rest = size; + errno = 0; + while( rest > 0 ) + { + errno = 0; + const int n = write( fd, buf + size - rest, rest ); + if( n > 0 ) rest -= n; + else if( errno && errno != EINTR && errno != EAGAIN ) break; + } + return ( rest > 0 ) ? size - rest : size; + } + + +int main( const int argc, const char * argv[] ) + { + Opts opts; + // Mapping from gzip/bzip2 style 1..9 compression modes + // to the corresponding LZMA compression modes. + const lzma_options option_mapping[] = + { + { 1 << 20, 10 }, // -1 + { 1 << 20, 12 }, // -2 + { 1 << 20, 17 }, // -3 + { 1 << 21, 26 }, // -4 + { 1 << 22, 44 }, // -5 + { 1 << 23, 80 }, // -6 + { 1 << 24, 108 }, // -7 + { 1 << 24, 163 }, // -8 + { 1 << 25, 273 } }; // -9 + lzma_options encoder_options = option_mapping[5]; // default = "-6" + int inhandle = -1; + Mode program_mode = m_compress; + bool force = false; + bool keep_input_files = false; + bool to_stdout = false; + std::string input_filename; + std::string default_output_filename; + std::vector< std::string > filenames; + invocation_name = argv[0]; + + if( LZ_version()[0] != LZ_version_string[0] ) + internal_error( "bad library version" ); + + main_thread = pthread_self(); + pid = getpid(); + + mallocf = malloc; + freef = free; + + xsigaction(SIGPIPE, SIG_IGN); + xsigaction(SIGXFSZ, SIG_IGN); + + /* Effectuate option defaults. */ + long max_worker = sysconf(_SC_THREAD_THREADS_MAX); + if (-1L == max_worker) { + max_worker = LONG_MAX; + } + if (UINT_MAX < (long unsigned)max_worker) { + max_worker = UINT_MAX; + } + if (UINT_MAX / blf < (unsigned)max_worker) { + max_worker = UINT_MAX / blf; + } + if ((size_t)-1 / sizeof(pthread_t) < (unsigned)max_worker) { + max_worker = (size_t)-1 / sizeof(pthread_t); + } + + opts.num_worker = 0u; + opts.clidx = 5u; + opts.print_cctrs = 0; + + const Arg_parser::Option options[] = + { + { '1', "fast", Arg_parser::no }, + { '2', 0, Arg_parser::no }, + { '3', 0, Arg_parser::no }, + { '4', 0, Arg_parser::no }, + { '5', 0, Arg_parser::no }, + { '6', 0, Arg_parser::no }, + { '7', 0, Arg_parser::no }, + { '8', 0, Arg_parser::no }, + { '9', "best", Arg_parser::no }, + { 'b', "member-size", Arg_parser::yes }, + { 'c', "stdout", Arg_parser::no }, + { 'd', "decompress", Arg_parser::no }, + { 'D', "debug", Arg_parser::yes }, + { 'f', "force", Arg_parser::no }, + { 'h', "help", Arg_parser::no }, + { 'k', "keep", Arg_parser::no }, + { 'm', "match-length", Arg_parser::yes }, + { 'n', "threads", Arg_parser::yes }, + { 'o', "output", Arg_parser::yes }, + { 'q', "quiet", Arg_parser::no }, + { 's', "dictionary-size", Arg_parser::yes }, + { 'S', "volume-size", Arg_parser::yes }, + { 't', "test", Arg_parser::no }, + { 'v', "verbose", Arg_parser::no }, + { 'V', "version", Arg_parser::no }, + { 0 , 0, Arg_parser::no } }; + + Arg_parser parser( argc, argv, options ); + if( parser.error().size() ) // bad option + { show_error( parser.error().c_str(), 0, true ); return 1; } + + int argind = 0; + for( ; argind < parser.arguments(); ++argind ) + { + const int code = parser.code( argind ); + if( !code ) break; // no more options + const char * arg = parser.argument( argind ).c_str(); + switch( code ) + { + case '1': case '2': case '3': + case '4': case '5': case '6': + case '7': case '8': case '9': + opts.clidx = code - '1'; + encoder_options = option_mapping[code-'1']; break; + case 'c': to_stdout = true; break; + case 'd': program_mode = m_decompress; break; + case 'D': { int debug_level = getnum( arg, 0, 0, 3 ); + if( debug_level & 1 ) opts.print_cctrs = 1; + if( debug_level & 2 ) + { mallocf = trace_malloc; freef = trace_free; } } + break; + case 'f': force = true; break; + case 'h': show_help(); return 0; + case 'k': keep_input_files = true; break; + case 'm': encoder_options.match_len_limit = + getnum( arg, 0, 5, 273 ); break; + case 'o': default_output_filename = arg; break; + case 'n': opts.num_worker = getnum( arg, 0, 1, max_worker ); break; + case 'q': verbosity = -1; break; + case 's': encoder_options.dictionary_size = get_dict_size( arg ); + break; + case 't': program_mode = m_test; break; + case 'v': if( verbosity < 4 ) ++verbosity; break; + case 'V': show_version(); return 0; + default : internal_error( "uncaught option" ); + } + } + + if( opts.num_worker <= 0 ) + { +#ifdef _SC_NPROCESSORS_ONLN + long num_online = sysconf( _SC_NPROCESSORS_ONLN ); + if( num_online <= 0 ) + { + show_error( "number of online processors unavailable.", 0, true ); + fatal(); + } + opts.num_worker = std::min( num_online, max_worker ); +#else + show_error( "number of (de)compression threads not set.", 0, true ); + fatal(); +#endif + } + assert(UINT_MAX / blf >= opts.num_worker); + unsigned num_slot = opts.num_worker * blf; + + bool filenames_given = false; + for( ; argind < parser.arguments(); ++argind ) + { + if( parser.argument( argind ) != "-" ) filenames_given = true; + filenames.push_back( parser.argument( argind ) ); + } + + if( filenames.empty() ) filenames.push_back("-"); + if( filenames_given && program_mode != m_compress ) set_signals(); + + Pretty_print pp( filenames ); + if( program_mode == m_test ) + outhandle = -1; + + int retval = 0; + for( unsigned int i = 0; i < filenames.size(); ++i ) + { + struct stat in_stats; + output_filename.clear(); + + if( !filenames[i].size() || filenames[i] == "-" ) + { + input_filename.clear(); + inhandle = STDIN_FILENO; + if( program_mode != m_test ) + { + if( to_stdout || !default_output_filename.size() ) + outhandle = STDOUT_FILENO; + else + { + if( program_mode == m_compress ) + set_c_outname( default_output_filename ); + else output_filename = default_output_filename; + if( !open_outstream( force ) ) + { + if( outhandle == -1 && retval < 1 ) retval = 1; + close( inhandle ); inhandle = -1; + continue; + } + } + } + } + else + { + input_filename = filenames[i]; + const int eindex = extension_index( input_filename ); + inhandle = open_instream( input_filename, &in_stats, program_mode, + eindex, force, to_stdout ); + if( inhandle < 0 ) { if( retval < 1 ) retval = 1; continue; } + if( program_mode != m_test ) + { + if( to_stdout ) outhandle = STDOUT_FILENO; + else + { + if( program_mode == m_compress ) + set_c_outname( input_filename ); + else set_d_outname( input_filename, eindex ); + if( !open_outstream( force ) ) + { + if( outhandle == -1 && retval < 1 ) retval = 1; + close( inhandle ); inhandle = -1; + continue; + } + } + } + } + + if( !check_tty( inhandle, program_mode ) ) return 1; + + if( output_filename.size() && !to_stdout && program_mode != m_test ) + delete_output_on_interrupt = true; + const struct stat * in_statsp = input_filename.size() ? &in_stats : 0; + pp.set_name( input_filename ); + int tmp = 0; + if( program_mode == m_compress ) + { + sigset_t unblocked; + sigs_mod(1, &unblocked); + process( &opts, num_slot, inhandle, outhandle, pp, &unblocked ); + sigs_mod(0, &unblocked); + } + else + tmp = decompress( inhandle, pp, program_mode == m_test ); + if( tmp > retval ) retval = tmp; + if( tmp && program_mode != m_test ) cleanup_and_fail( retval ); + + if( delete_output_on_interrupt ) + close_and_set_permissions( in_statsp, &retval ); + if( input_filename.size() ) + { + close( inhandle ); inhandle = -1; + if( !keep_input_files && !to_stdout && program_mode != m_test ) + std::remove( input_filename.c_str() ); + } + } + if( outhandle >= 0 && close( outhandle ) != 0 ) + { + if( verbosity >= 0 ) + std::fprintf( stderr, "%s: Can't close stdout: %s.\n", + program_name, std::strerror( errno ) ); + if( retval < 1 ) retval = 1; + } + return retval; + } @@ -0,0 +1,80 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +void show_error( const char * msg, const int errcode = 0, const bool help = false ) throw(); +extern void *(*mallocf)(size_t size); +extern void (*freef)(void *ptr); + + +struct Cond +{ + pthread_mutex_t lock; /* Lock this to protect shared resource. */ + pthread_cond_t cond; /* Trigger this if predicate becomes true. */ + long unsigned ccount, /* Increment this when checking predicate. */ + wcount; /* Increment this when waiting is necessary. */ +}; + + +/* Terminate the process with EXIT_FAILURE. */ +void +fatal(void); + +/* Format operation and append resolved error, then call fatal(). */ +void +fail(const char *fmt, int err, ...) +#ifdef __GNUC__ +__attribute__((format(printf, 1, 3))) +#endif +; + +/* If these primitives fail, they call fail(), which in turn calls fatal(). */ +void * +xalloc(size_t size); + +void +xinit(Cond *cond); + +void +xdestroy(Cond *cond); + +void +xlock(Cond *cond); + +void +xlock_pred(Cond *cond); + +void +xunlock(Cond *cond); + +void +xwait(Cond *cond); + +void +xsignal(Cond *cond); + +void +xbroadcast(Cond *cond); + +void +xcreate(pthread_t *thread, void *(*routine)(void *), void *arg); + +void +xjoin(pthread_t thread); + +void +xraise(int sig); diff --git a/plzip.cc b/plzip.cc new file mode 100644 index 0000000..f110437 --- /dev/null +++ b/plzip.cc @@ -0,0 +1,669 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +#define _FILE_OFFSET_BITS 64 + +#include <cassert> +#include <cerrno> +#include <climits> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <stdint.h> +#include <unistd.h> +#include <lzlib.h> + +#include "main.h" +#include "plzip.h" +#include "lacos_rbtree.h" + + +struct S2w_blk /* Splitter to workers. */ +{ + uint64_t id; /* Block serial number as read from infd. */ + S2w_blk *next; /* Next in queue. */ + size_t loaded; /* # of bytes in plain, may be 0 for 1st. */ + char unsigned plain[1]; /* Data read from infd, allocated: sizeof_plain. */ +}; + + +struct S2w_q +{ + Cond av_or_eof; /* New block available or splitter done. */ + S2w_blk *tail, /* Splitter will append here. */ + *head; /* Next ready worker shall compress this. */ + int eof; /* Splitter done. */ +}; + + +static void +s2w_q_init(S2w_q *s2w_q) +{ + xinit(&s2w_q->av_or_eof); + s2w_q->tail = 0; + s2w_q->head = 0; + s2w_q->eof = 0; +} + + +static void +s2w_q_uninit(S2w_q *s2w_q) +{ + assert(0 != s2w_q->eof); + assert(0 == s2w_q->head); + assert(0 == s2w_q->tail); + xdestroy(&s2w_q->av_or_eof); +} + + +struct W2m_blk /* Workers to muxer. */ +{ + uint64_t id; /* Block index as read from infd. */ + W2m_blk *next; /* Next block in list (unordered). */ + size_t produced; /* Number of bytes in compr. */ + char unsigned compr[1]; /* Data to write to outfd, alloc.: sizeof_compr. */ +}; + + +static int +w2m_blk_cmp(const void *v_a, const void *v_b) +{ + uint64_t a, + b; + + a = ((const W2m_blk *)v_a)->id; + b = ((const W2m_blk *)v_b)->id; + + return + a < b ? -1 + : a > b ? 1 + : 0; +} + + +struct W2m_q +{ + Cond av_or_exit; /* New block available or all workers exited. */ + uint64_t needed; /* Block needed for resuming writing. */ + W2m_blk *head; /* Block list (unordered). */ + unsigned working; /* Number of workers still running. */ +}; + + +static void +w2m_q_init(W2m_q *w2m_q, unsigned num_worker) +{ + assert(0u < num_worker); + xinit(&w2m_q->av_or_exit); + w2m_q->needed = 0u; + w2m_q->head = 0; + w2m_q->working = num_worker; +} + + +static void +w2m_q_uninit(W2m_q *w2m_q) +{ + assert(0u == w2m_q->working); + assert(0 == w2m_q->head); + xdestroy(&w2m_q->av_or_exit); +} + + +struct M2s_q /* Muxer to splitter. */ +{ + Cond av; /* Free slot available. */ + unsigned num_free; /* Number of free slots. */ +}; + + +static void +m2s_q_init(M2s_q *m2s_q, unsigned num_free) +{ + assert(0u < num_free); + xinit(&m2s_q->av); + m2s_q->num_free = num_free; +} + + +static void +m2s_q_uninit(M2s_q *m2s_q, unsigned num_free) +{ + assert(m2s_q->num_free == num_free); + xdestroy(&m2s_q->av); +} + + +static void +split(M2s_q *m2s_q, S2w_q *s2w_q, int infd, + const size_t sizeof_plain, const size_t sizeof_s2w_blk) +{ + uint64_t id; + ssize_t rd; + + id = 0u; + do { + S2w_blk *s2w_blk; + size_t vacant; + + /* Grab a free slot. */ + xlock_pred(&m2s_q->av); + while (0u == m2s_q->num_free) { + xwait(&m2s_q->av); + } + --m2s_q->num_free; + xunlock(&m2s_q->av); + s2w_blk = (S2w_blk *)xalloc(sizeof_s2w_blk); + + /* Fill block. */ + vacant = sizeof_plain; + do { + rd = read(infd, s2w_blk->plain + (sizeof_plain - vacant), + vacant > (size_t)SSIZE_MAX ? (size_t)SSIZE_MAX : vacant); + } while (0 < rd && 0u < (vacant -= (size_t)rd)); + + /* Read error. */ + if (-1 == rd) { + fail("read()", errno); + } + + if (sizeof_plain == vacant && 0u < id) { + /* EOF on first read, but not for first input block. */ + (*freef)(s2w_blk); + xlock(&m2s_q->av); + ++m2s_q->num_free; + xunlock(&m2s_q->av); + } + else { + s2w_blk->id = id; + s2w_blk->next = 0; + s2w_blk->loaded = sizeof_plain - vacant; + } + + /* We either push a block, or set EOF, or both. */ + assert(sizeof_plain > vacant || 0 == rd); + + xlock(&s2w_q->av_or_eof); + if (0 == s2w_q->head) { + xbroadcast(&s2w_q->av_or_eof); + } + + if (sizeof_plain > vacant || 0u == id) { + if (0 == s2w_q->tail) { + s2w_q->head = s2w_blk; + } + else { + s2w_q->tail->next = s2w_blk; + } + s2w_q->tail = s2w_blk; + } + s2w_q->eof = (0 == rd); + xunlock(&s2w_q->av_or_eof); + + /* + If we didn't push a block, then this is bogus, but then we did set EOF, + so it doesn't matter, because we'll leave immediately. + */ + ++id; + } while (0 < rd); +} + + +struct Split_arg +{ + M2s_q *m2s_q; + S2w_q *s2w_q; + int infd; + size_t sizeof_plain, + sizeof_S2w_blk; +}; + + +static void * +split_wrap(void *v_split_arg) +{ + Split_arg *split_arg = (Split_arg *)v_split_arg; + + split( + split_arg->m2s_q, + split_arg->s2w_q, + split_arg->infd, + split_arg->sizeof_plain, + split_arg->sizeof_S2w_blk + ); + return 0; +} + + +static void +work_lz_rd(W2m_blk *w2m_blk, const size_t sizeof_compr, void *lz) +{ + int rd; + + assert(w2m_blk->produced < sizeof_compr); + rd = LZ_compress_read(lz, w2m_blk->compr + w2m_blk->produced, + sizeof_compr - w2m_blk->produced); + if (-1 == rd) { + show_error( "LZ_compress_read() failed." ); + fatal(); + } + w2m_blk->produced += (size_t)rd; +} + + +struct Compr_lev +{ + unsigned dict_size, + mx_match; +}; + + +static const Compr_lev compr_lev[] = { + { 1u * 1024u * 1024u, 10u }, + { 1u * 1024u * 1024u, 12u }, + { 1u * 1024u * 1024u, 17u }, + { 2u * 1024u * 1024u, 26u }, + { 4u * 1024u * 1024u, 44u }, + { 8u * 1024u * 1024u, 80u }, + { 16u * 1024u * 1024u, 108u }, + { 16u * 1024u * 1024u, 163u }, + { 32u * 1024u * 1024u, 273u } +}; + + +static void +work_compr(S2w_blk *s2w_blk, W2m_q *w2m_q, unsigned clidx, + const size_t sizeof_compr, const size_t sizeof_w2m_blk) +{ + W2m_blk *w2m_blk; + + assert(0u < s2w_blk->loaded || 0u == s2w_blk->id); + + w2m_blk = (W2m_blk *)xalloc(sizeof_w2m_blk); + + /* Single member compression. Settings like with lzip -6. */ + { + void *lz; + size_t written; + + lz = LZ_compress_open(compr_lev[clidx].dict_size, + compr_lev[clidx].mx_match, (uint64_t)-1 / 2u); + if (LZ_ok != LZ_compress_errno(lz)) { + show_error( "LZ_compress_open() failed." ); + fatal(); + } + + written = 0u; + w2m_blk->produced = 0u; + while (written < s2w_blk->loaded) { + int wr; + + wr = LZ_compress_write(lz, s2w_blk->plain + written, + s2w_blk->loaded - written); + if (-1 == wr) { + show_error( "LZ_compress_write() failed." ); + fatal(); + } + written += (size_t)wr; + + work_lz_rd(w2m_blk, sizeof_compr, lz); + } + + if (-1 == LZ_compress_finish(lz)) { + show_error( "LZ_compress_finish() failed." ); + fatal(); + } + + while (!LZ_compress_finished(lz)) { + work_lz_rd(w2m_blk, sizeof_compr, lz); + } + + if (-1 == LZ_compress_close(lz)) { + show_error( "LZ_compress_close() failed." ); + fatal(); + } + } + + w2m_blk->id = s2w_blk->id; + + /* Push block to muxer. */ + xlock(&w2m_q->av_or_exit); + w2m_blk->next = w2m_q->head; + w2m_q->head = w2m_blk; + if (w2m_blk->id == w2m_q->needed) { + xsignal(&w2m_q->av_or_exit); + } + xunlock(&w2m_q->av_or_exit); +} + + +static void +work(S2w_q *s2w_q, W2m_q *w2m_q, unsigned clidx, + const size_t sizeof_compr, const size_t sizeof_w2m_blk) +{ + for (;;) { + S2w_blk *s2w_blk; + + /* Grab a block to work on. */ + xlock_pred(&s2w_q->av_or_eof); + while (0 == s2w_q->head && !s2w_q->eof) { + xwait(&s2w_q->av_or_eof); + } + if (0 == s2w_q->head) { + /* No blocks available and splitter exited. */ + xunlock(&s2w_q->av_or_eof); + break; + } + s2w_blk = s2w_q->head; + s2w_q->head = s2w_blk->next; + if (0 == s2w_q->head) { + s2w_q->tail = 0; + } + xunlock(&s2w_q->av_or_eof); + + work_compr(s2w_blk, w2m_q, clidx, sizeof_compr, sizeof_w2m_blk); + (*freef)(s2w_blk); + } + + /* Notify muxer when last worker exits. */ + xlock(&w2m_q->av_or_exit); + if (0u == --w2m_q->working && 0 == w2m_q->head) { + xsignal(&w2m_q->av_or_exit); + } + xunlock(&w2m_q->av_or_exit); +} + + +struct Work_arg +{ + S2w_q *s2w_q; + W2m_q *w2m_q; + unsigned clidx; + size_t sizeof_compr, + sizeof_W2m_blk; +}; + + +static void * +work_wrap(void *v_work_arg) +{ + Work_arg *work_arg; + + work_arg = (Work_arg *)v_work_arg; + work( + work_arg->s2w_q, + work_arg->w2m_q, + work_arg->clidx, + work_arg->sizeof_compr, + work_arg->sizeof_W2m_blk + ); + return 0; +} + + +static void * +reord_alloc(size_t size, void *) +{ + return (*mallocf)(size); +} + + +static void +reord_dealloc(void *ptr, void *) +{ + (*freef)(ptr); +} + + +static void +mux_write(M2s_q *m2s_q, lacos_rbtree_node **reord, + uint64_t *reord_needed, int outfd) +{ + assert(0 != *reord); + + /* + Go on until the tree becomes empty or the next block is found to be + missing. + */ + do { + lacos_rbtree_node *reord_head; + W2m_blk *reord_w2m_blk; + + reord_head = lacos_rbtree_min(*reord); + assert(0 != reord_head); + + reord_w2m_blk = (W2m_blk *)(*(void **)reord_head); + if (reord_w2m_blk->id != *reord_needed) { + break; + } + + /* Write out "reord_w2m_blk". */ + if (-1 != outfd) { + char unsigned *cp; + + cp = reord_w2m_blk->compr; + while (reord_w2m_blk->produced > 0u) { + ssize_t written; + + written = write(outfd, cp, reord_w2m_blk->produced > (size_t)SSIZE_MAX + ? (size_t)SSIZE_MAX : reord_w2m_blk->produced); + if (-1 == written) { + fail("write()", errno); + } + + reord_w2m_blk->produced -= (size_t)written; + cp += written; + } + } + + ++*reord_needed; + + xlock(&m2s_q->av); + if (0u == m2s_q->num_free++) { + xsignal(&m2s_q->av); + } + xunlock(&m2s_q->av); + + lacos_rbtree_delete( + reord, /* new_root */ + reord_head, /* old_node */ + 0, /* old_data */ + reord_dealloc, /* dealloc() */ + 0 /* alloc_ctl */ + ); + + /* Release "reord_w2m_blk". */ + (*freef)(reord_w2m_blk); + } while (0 != *reord); +} + + +static void +mux(W2m_q *w2m_q, M2s_q *m2s_q, int outfd) +{ + lacos_rbtree_node *reord; + uint64_t reord_needed; + + reord = 0; + reord_needed = 0u; + + xlock_pred(&w2m_q->av_or_exit); + for (;;) { + W2m_blk *w2m_blk; + + /* Grab all available compressed blocks in one step. */ + while (0 == w2m_q->head && 0u < w2m_q->working) { + xwait(&w2m_q->av_or_exit); + } + + if (0 == w2m_q->head) { + /* w2m_q is empty and all workers exited */ + break; + } + + w2m_blk = w2m_q->head; + w2m_q->head = 0; + xunlock(&w2m_q->av_or_exit); + + /* Merge blocks fetched this time into tree. */ + do { + lacos_rbtree_node *new_node; + W2m_blk *next; + + if (-1 == lacos_rbtree_insert( + &reord, /* new_root */ + &new_node, /* new_node */ + w2m_blk, /* new_data */ + w2m_blk_cmp, /* cmp() */ + reord_alloc, /* alloc() */ + 0 /* alloc_ctl */ + )) { + /* id collision shouldn't happen */ + assert(0 == new_node); + show_error( "lacos_rbtree_insert(): out of memory." ); + fatal(); + } + + next = w2m_blk->next; + w2m_blk->next = 0; + w2m_blk = next; + } while (0 != w2m_blk); + + /* Write out initial continuous sequence of reordered blocks. */ + mux_write(m2s_q, &reord, &reord_needed, outfd); + + xlock_pred(&w2m_q->av_or_exit); + w2m_q->needed = reord_needed; + } + xunlock(&w2m_q->av_or_exit); + + assert(0 == reord); +} + + +static void +plzip(unsigned num_worker, unsigned num_slot, unsigned clidx, int print_cctrs, + int infd, int outfd) +{ + S2w_q s2w_q; + W2m_q w2m_q; + M2s_q m2s_q; + Split_arg split_arg; + pthread_t splitter; + Work_arg work_arg; + pthread_t *worker; + unsigned i; + + assert(clidx < sizeof compr_lev / sizeof compr_lev[0]); + + s2w_q_init(&s2w_q); + w2m_q_init(&w2m_q, num_worker); + m2s_q_init(&m2s_q, num_slot); + +#define SIZES(struc, arr, arsz_unsigned, arg) \ + do { \ + unsigned tmp; \ +\ + tmp = arsz_unsigned; \ + if ((size_t)-1 < tmp) { \ + show_error( "size_t overflow in sizeof_" #arr "." ); \ + fatal(); \ + } \ + arg ## _arg . sizeof_ ## arr = tmp; \ +\ + if ((size_t)-1 - sizeof(struc) \ + < arg ## _arg . sizeof_ ## arr - (size_t)1) { \ + show_error( "size_t overflow in sizeof_" #struc "." ); \ + fatal(); \ + } \ + arg ## _arg . sizeof_ ## struc = sizeof(struc) \ + + (arg ## _arg . sizeof_ ## arr - (size_t)1); \ + } while (0) + + split_arg.m2s_q = &m2s_q; + split_arg.s2w_q = &s2w_q; + split_arg.infd = infd; + SIZES(S2w_blk, plain, 2u * compr_lev[clidx].dict_size, split); + xcreate(&splitter, split_wrap, &split_arg); + + work_arg.s2w_q = &s2w_q; + work_arg.w2m_q = &w2m_q; + work_arg.clidx = clidx; + SIZES(W2m_blk, compr, (4u + 1u + 1u) + + ((unsigned)split_arg.sizeof_plain * 9u + 7u) / 8u + (4u + 8u + 8u), + work); + +#undef SIZES + + assert(0u < num_worker); + assert((size_t)-1 / sizeof *worker >= num_worker); + worker = (pthread_t *)xalloc(num_worker * sizeof *worker); + for (i = 0u; i < num_worker; ++i) { + xcreate(&worker[i], work_wrap, &work_arg); + } + + mux(&w2m_q, &m2s_q, outfd); + + i = num_worker; + do { + xjoin(worker[--i]); + } while (0u < i); + (*freef)(worker); + + xjoin(splitter); + + const int FW = ( sizeof(long unsigned) * 8 ) / 3 + 1; + if (print_cctrs && 0 > fprintf(stderr, + "any worker tried to consume from splitter: %*lu\n" + "any worker stalled : %*lu\n" + "muxer tried to consume from workers : %*lu\n" + "muxer stalled : %*lu\n" + "splitter tried to consume from muxer : %*lu\n" + "splitter stalled : %*lu\n", + FW, s2w_q.av_or_eof.ccount, + FW, s2w_q.av_or_eof.wcount, + FW, w2m_q.av_or_exit.ccount, + FW, w2m_q.av_or_exit.wcount, + FW, m2s_q.av.ccount, + FW, m2s_q.av.wcount) ) + { + fatal(); + } + + m2s_q_uninit(&m2s_q, num_slot); + w2m_q_uninit(&w2m_q); + s2w_q_uninit(&s2w_q); +} + + +void * +plzip_wrap(void *v_arg) +{ + Plzip_arg *arg = (Plzip_arg *)v_arg; + plzip( + arg->num_worker, + arg->num_slot, + arg->clidx, + arg->print_cctrs, + arg->infd, + arg->outfd + ); + + xraise(SIGUSR2); + return 0; +} @@ -0,0 +1,30 @@ +/* Plzip - A parallel version of the lzip data compressor + Copyright (C) 2009 Laszlo Ersek. + Copyright (C) 2009 Antonio Diaz Diaz. + + 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 3 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, see <http://www.gnu.org/licenses/>. +*/ + +struct Plzip_arg +{ + unsigned num_worker, + num_slot, + clidx; + int print_cctrs, + infd, + outfd; +}; + +void * +plzip_wrap(void *v_arg); diff --git a/testsuite/COPYING.lz b/testsuite/COPYING.lz Binary files differnew file mode 100644 index 0000000..a09b1e8 --- /dev/null +++ b/testsuite/COPYING.lz diff --git a/testsuite/check.sh b/testsuite/check.sh new file mode 100755 index 0000000..8a2ecd0 --- /dev/null +++ b/testsuite/check.sh @@ -0,0 +1,69 @@ +#! /bin/sh +# check script for Plzip - A parallel version of the lzip data compressor +# Copyright (C) 2009 Antonio Diaz Diaz. +# +# This script is free software: you have unlimited permission +# to copy, distribute and modify it. + +LC_ALL=C +export LC_ALL +objdir=`pwd` +testdir=`cd "$1" ; pwd` +LZIP="${objdir}"/plzip +framework_failure() { echo 'failure in testing framework'; exit 1; } + +if [ ! -x "${LZIP}" ] ; then + echo "${LZIP}: cannot execute" + exit 1 +fi + +if [ -d tmp ] ; then rm -rf tmp ; fi +mkdir tmp +echo -n "testing plzip..." +cd "${objdir}"/tmp + +cat "${testdir}"/../COPYING > in || framework_failure +fail=0 + +"${LZIP}" -cd "${testdir}"/COPYING.lz > copy || fail=1 +cmp in copy || fail=1 + +for i in s4096 1 2 3 4 5 6 7 8; do + "${LZIP}" -k -$i in || fail=1 + mv -f in.lz copy.lz || fail=1 + echo -n "garbage" >> copy.lz || fail=1 + "${LZIP}" -df copy.lz || fail=1 + cmp in copy || fail=1 + echo -n . +done + +for i in s4096 1 2 3 4 5 6 7 8; do + "${LZIP}" -c -$i in > out || fail=1 + echo -n "g" >> out || fail=1 + "${LZIP}" -cd out > copy || fail=1 + cmp in copy || fail=1 + echo -n . +done + +for i in s4096 1 2 3 4 5 6 7 8; do + "${LZIP}" -c -$i < in > out || fail=1 + "${LZIP}" -d < out > copy || fail=1 + cmp in copy || fail=1 + echo -n . +done + +for i in s4096 1 2 3 4 5 6 7 8; do + "${LZIP}" -f -$i -o out < in || fail=1 + "${LZIP}" -df -o copy < out.lz || fail=1 + cmp in copy || fail=1 + echo -n . +done + +echo +if [ ${fail} = 0 ] ; then + echo "tests completed successfully." + cd "${objdir}" && rm -r tmp +else + echo "tests failed." +fi +exit ${fail} |