mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Run gofmt
This commit is contained in:
1 parent
315b2e5262
commit
be1f605108
9 files changed
+378
-372
No files matched your search
+14
-14
@@ -35,20 +35,20 @@
|
||||
// To quantify "much faster", on this one C file, this program was 80 times
|
||||
// faster than `clang-format`, even without a column limit:
|
||||
//
|
||||
// $ wc release/c/wuffs-v0.2.c
|
||||
// 11858 35980 431885 release/c/wuffs-v0.2.c
|
||||
// $ time dumbindent < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.008s
|
||||
// user 0m0.005s
|
||||
// sys 0m0.005s
|
||||
// $ time clang-format-9 < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.668s
|
||||
// user 0m0.618s
|
||||
// sys 0m0.032s
|
||||
// $ time clang-format-9 -style='{ColumnLimit: 0}' < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.641s
|
||||
// user 0m0.585s
|
||||
// sys 0m0.037s
|
||||
// $ wc release/c/wuffs-v0.2.c
|
||||
// 11858 35980 431885 release/c/wuffs-v0.2.c
|
||||
// $ time dumbindent < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.008s
|
||||
// user 0m0.005s
|
||||
// sys 0m0.005s
|
||||
// $ time clang-format-9 < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.668s
|
||||
// user 0m0.618s
|
||||
// sys 0m0.032s
|
||||
// $ time clang-format-9 -style='{ColumnLimit: 0}' < release/c/wuffs-v0.2.c > /dev/null
|
||||
// real 0m0.641s
|
||||
// user 0m0.585s
|
||||
// sys 0m0.037s
|
||||
//
|
||||
// More commentary is at:
|
||||
// https://godoc.org/github.com/google/wuffs/lib/dumbindent
|
||||
|
||||
+137
-137
@@ -33,7 +33,7 @@ https://github.com/google/wuffs/blob/main/doc/spec/rac-spec.md
|
||||
|
||||
Usage:
|
||||
|
||||
ractool [flags] [input_filename]
|
||||
ractool [flags] [input_filename]
|
||||
|
||||
If no input_filename is given, stdin is used. Either way, output is written to
|
||||
stdout.
|
||||
@@ -63,10 +63,10 @@ or temporary disk space.
|
||||
|
||||
Examples:
|
||||
|
||||
ractool -decode foo.rac | sha256sum
|
||||
ractool -decode -drange=400..500 foo.rac
|
||||
ractool -encode foo.dat > foo.rac
|
||||
ractool -encode -codec=zlib -dchunksize=256k foo.dat > foo.rac
|
||||
ractool -decode foo.rac | sha256sum
|
||||
ractool -decode -drange=400..500 foo.rac
|
||||
ractool -encode foo.dat > foo.rac
|
||||
ractool -encode -codec=zlib -dchunksize=256k foo.dat > foo.rac
|
||||
|
||||
The "400..500" flag value means the 100 bytes ranging from a DSpace offset
|
||||
(offset in terms of decompressed bytes, not compressed bytes) of 400
|
||||
@@ -79,42 +79,42 @@ Similarly, "1m" and "1M" both mean 1 mebibyte (1048576 bytes).
|
||||
|
||||
General Flags:
|
||||
|
||||
-decode
|
||||
whether to decode the input
|
||||
-encode
|
||||
whether to encode the input
|
||||
-quiet
|
||||
whether to suppress messages
|
||||
-decode
|
||||
whether to decode the input
|
||||
-encode
|
||||
whether to encode the input
|
||||
-quiet
|
||||
whether to suppress messages
|
||||
|
||||
Decode-Related Flags:
|
||||
|
||||
-drange
|
||||
the "i..j" range to decompress, "..8" means the first 8 bytes
|
||||
-singlethreaded
|
||||
whether to decode on a single execution thread
|
||||
-drange
|
||||
the "i..j" range to decompress, "..8" means the first 8 bytes
|
||||
-singlethreaded
|
||||
whether to decode on a single execution thread
|
||||
|
||||
Encode-Related Flags:
|
||||
|
||||
-cchunksize
|
||||
the chunk size (in CSpace)
|
||||
-codec
|
||||
the compression codec (default "zstd")
|
||||
-cpagesize
|
||||
the page size (in CSpace)
|
||||
-dchunksize
|
||||
the chunk size (in DSpace)
|
||||
-indexlocation
|
||||
the index location, "start" or "end" (default "start")
|
||||
-resources
|
||||
comma-separated list of resource files, such as shared dictionaries
|
||||
-tmpdir
|
||||
directory (e.g. $TMPDIR) for intermediate work; empty means in-memory
|
||||
-cchunksize
|
||||
the chunk size (in CSpace)
|
||||
-codec
|
||||
the compression codec (default "zstd")
|
||||
-cpagesize
|
||||
the page size (in CSpace)
|
||||
-dchunksize
|
||||
the chunk size (in DSpace)
|
||||
-indexlocation
|
||||
the index location, "start" or "end" (default "start")
|
||||
-resources
|
||||
comma-separated list of resource files, such as shared dictionaries
|
||||
-tmpdir
|
||||
directory (e.g. $TMPDIR) for intermediate work; empty means in-memory
|
||||
|
||||
Codecs:
|
||||
|
||||
lz4
|
||||
zlib
|
||||
zstd
|
||||
lz4
|
||||
zlib
|
||||
zstd
|
||||
|
||||
Only zlib is fully supported. The others will work for the flags' default
|
||||
values, but they (1) don't support -cchunksize, only -dchunksize, and (2) don't
|
||||
@@ -125,123 +125,123 @@ Installation:
|
||||
|
||||
Like any other implemented-in-Go program, to install the ractool program:
|
||||
|
||||
go install github.com/google/wuffs/cmd/ractool
|
||||
go install github.com/google/wuffs/cmd/ractool
|
||||
|
||||
Extended Example:
|
||||
|
||||
--------
|
||||
$ # Fetch and unzip the enwik8 test file, a sample of Wikipedia.
|
||||
$ wget http://mattmahoney.net/dc/enwik8.zip
|
||||
$ unzip enwik8.zip
|
||||
--------
|
||||
$ # Fetch and unzip the enwik8 test file, a sample of Wikipedia.
|
||||
$ wget http://mattmahoney.net/dc/enwik8.zip
|
||||
$ unzip enwik8.zip
|
||||
|
||||
$ # Also zstd-encode it, as a reference point. Using compression level 15,
|
||||
$ # instead of the default of 3, matches what ractool uses.
|
||||
$ zstd -15 enwik8
|
||||
$ # Also zstd-encode it, as a reference point. Using compression level 15,
|
||||
$ # instead of the default of 3, matches what ractool uses.
|
||||
$ zstd -15 enwik8
|
||||
|
||||
$ # Create a shared dictionary. Using zstd-the-program produces a
|
||||
$ # dictionary that is especially useful for zstd-the-format, but it can
|
||||
$ # also be used by other formats as a 'raw' prefix dictionary.
|
||||
$ zstd -15 --train -B64K --maxdict=32K -o dict.dat enwik8
|
||||
$ # Create a shared dictionary. Using zstd-the-program produces a
|
||||
$ # dictionary that is especially useful for zstd-the-format, but it can
|
||||
$ # also be used by other formats as a 'raw' prefix dictionary.
|
||||
$ zstd -15 --train -B64K --maxdict=32K -o dict.dat enwik8
|
||||
|
||||
$ # RAC-encode it with various codecs, with and without that dictionary.
|
||||
$ ractool -encode -codec=zlib -resources=dict.dat enwik8 > zlib.withdict.rac
|
||||
$ ractool -encode -codec=zlib enwik8 > zlib.sansdict.rac
|
||||
$ ractool -encode -codec=zstd -resources=dict.dat enwik8 > zstd.withdict.rac
|
||||
$ ractool -encode -codec=zstd enwik8 > zstd.sansdict.rac
|
||||
$ ractool -encode -codec=lz4 enwik8 > lz4.sansdict.rac
|
||||
$ # RAC-encode it with various codecs, with and without that dictionary.
|
||||
$ ractool -encode -codec=zlib -resources=dict.dat enwik8 > zlib.withdict.rac
|
||||
$ ractool -encode -codec=zlib enwik8 > zlib.sansdict.rac
|
||||
$ ractool -encode -codec=zstd -resources=dict.dat enwik8 > zstd.withdict.rac
|
||||
$ ractool -encode -codec=zstd enwik8 > zstd.sansdict.rac
|
||||
$ ractool -encode -codec=lz4 enwik8 > lz4.sansdict.rac
|
||||
|
||||
$ # The size overhead (comparing RAC+Xxx to Xxx) is about 0.2% (with) or
|
||||
$ # 4.8% (sans) for zlib/zip and about 13% (with) or 28% (sans) for zstd,
|
||||
$ # depending on whether we used a shared dictionary (with or sans).
|
||||
$ ls -l
|
||||
total 362080
|
||||
-rw-r----- 1 tao tao 32768 Oct 25 10:10 dict.dat
|
||||
-rw-r----- 1 tao tao 100000000 Jun 2 2011 enwik8
|
||||
-rw-r----- 1 tao tao 36445475 Sep 2 2011 enwik8.zip
|
||||
-rw-r----- 1 tao tao 29563109 Jun 2 2011 enwik8.zst
|
||||
-rw-r----- 1 tao tao 58813316 Oct 25 10:17 lz4.sansdict.rac
|
||||
-rw-r----- 1 tao tao 38185178 Oct 25 10:16 zlib.sansdict.rac
|
||||
-rw-r----- 1 tao tao 36505786 Oct 25 10:16 zlib.withdict.rac
|
||||
-rw-r----- 1 tao tao 37820491 Oct 25 10:17 zstd.sansdict.rac
|
||||
-rw-r----- 1 tao tao 33386395 Oct 25 10:17 zstd.withdict.rac
|
||||
$ # The size overhead (comparing RAC+Xxx to Xxx) is about 0.2% (with) or
|
||||
$ # 4.8% (sans) for zlib/zip and about 13% (with) or 28% (sans) for zstd,
|
||||
$ # depending on whether we used a shared dictionary (with or sans).
|
||||
$ ls -l
|
||||
total 362080
|
||||
-rw-r----- 1 tao tao 32768 Oct 25 10:10 dict.dat
|
||||
-rw-r----- 1 tao tao 100000000 Jun 2 2011 enwik8
|
||||
-rw-r----- 1 tao tao 36445475 Sep 2 2011 enwik8.zip
|
||||
-rw-r----- 1 tao tao 29563109 Jun 2 2011 enwik8.zst
|
||||
-rw-r----- 1 tao tao 58813316 Oct 25 10:17 lz4.sansdict.rac
|
||||
-rw-r----- 1 tao tao 38185178 Oct 25 10:16 zlib.sansdict.rac
|
||||
-rw-r----- 1 tao tao 36505786 Oct 25 10:16 zlib.withdict.rac
|
||||
-rw-r----- 1 tao tao 37820491 Oct 25 10:17 zstd.sansdict.rac
|
||||
-rw-r----- 1 tao tao 33386395 Oct 25 10:17 zstd.withdict.rac
|
||||
|
||||
$ # Check that the decompressed forms all match.
|
||||
$ cat enwik8 | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ unzip -p enwik8.zip | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ unzstd --stdout enwik8.zst | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ for f in *.rac; do ractool -decode $f | sha256sum; done
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ # Check that the decompressed forms all match.
|
||||
$ cat enwik8 | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ unzip -p enwik8.zip | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ unzstd --stdout enwik8.zst | sha256sum
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
$ for f in *.rac; do ractool -decode $f | sha256sum; done
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
2b49720ec4d78c3c9fabaee6e4179a5e997302b3a70029f30f2d582218c024a8 -
|
||||
|
||||
$ # Compare how long it takes to produce 8 bytes from the middle of
|
||||
$ # the decompressed file, which happens to be the word "Business".
|
||||
$ time unzip -p enwik8.zip | dd if=/dev/stdin status=none \
|
||||
> iflag=skip_bytes,count_bytes skip=50000000 count=8
|
||||
Business
|
||||
real 0m0.379s
|
||||
user 0m0.410s
|
||||
sys 0m0.080s
|
||||
$ time unzstd --stdout enwik8.zst | dd if=/dev/stdin status=none \
|
||||
> iflag=skip_bytes,count_bytes skip=50000000 count=8
|
||||
Business
|
||||
real 0m0.172s
|
||||
user 0m0.141s
|
||||
sys 0m0.103s
|
||||
$ time ractool -decode -drange=50000000..50000008 zstd.withdict.rac
|
||||
Business
|
||||
real 0m0.004s
|
||||
user 0m0.005s
|
||||
sys 0m0.001s
|
||||
$ # Compare how long it takes to produce 8 bytes from the middle of
|
||||
$ # the decompressed file, which happens to be the word "Business".
|
||||
$ time unzip -p enwik8.zip | dd if=/dev/stdin status=none \
|
||||
> iflag=skip_bytes,count_bytes skip=50000000 count=8
|
||||
Business
|
||||
real 0m0.379s
|
||||
user 0m0.410s
|
||||
sys 0m0.080s
|
||||
$ time unzstd --stdout enwik8.zst | dd if=/dev/stdin status=none \
|
||||
> iflag=skip_bytes,count_bytes skip=50000000 count=8
|
||||
Business
|
||||
real 0m0.172s
|
||||
user 0m0.141s
|
||||
sys 0m0.103s
|
||||
$ time ractool -decode -drange=50000000..50000008 zstd.withdict.rac
|
||||
Business
|
||||
real 0m0.004s
|
||||
user 0m0.005s
|
||||
sys 0m0.001s
|
||||
|
||||
$ # A RAC file's chunks can be decoded in parallel, unlike ZIP,
|
||||
$ # substantially reducing the real (wall clock) time taken even
|
||||
$ # though both of these files use DEFLATE (RFC 1951) compression.
|
||||
$ #
|
||||
$ # Comparing the -singlethreaded time suggests that zlib-the-library's
|
||||
$ # DEFLATE implementation is faster than unzip's.
|
||||
$ time unzip -p enwik8.zip > /dev/null
|
||||
real 0m0.711s
|
||||
user 0m0.690s
|
||||
sys 0m0.021s
|
||||
$ time ractool -decode -singlethreaded zlib.withdict.rac > /dev/null
|
||||
real 0m0.519s
|
||||
user 0m0.513s
|
||||
sys 0m0.017s
|
||||
$ time ractool -decode zlib.withdict.rac > /dev/null
|
||||
real 0m0.052s
|
||||
user 0m0.678s
|
||||
sys 0m0.036s
|
||||
$ # A RAC file's chunks can be decoded in parallel, unlike ZIP,
|
||||
$ # substantially reducing the real (wall clock) time taken even
|
||||
$ # though both of these files use DEFLATE (RFC 1951) compression.
|
||||
$ #
|
||||
$ # Comparing the -singlethreaded time suggests that zlib-the-library's
|
||||
$ # DEFLATE implementation is faster than unzip's.
|
||||
$ time unzip -p enwik8.zip > /dev/null
|
||||
real 0m0.711s
|
||||
user 0m0.690s
|
||||
sys 0m0.021s
|
||||
$ time ractool -decode -singlethreaded zlib.withdict.rac > /dev/null
|
||||
real 0m0.519s
|
||||
user 0m0.513s
|
||||
sys 0m0.017s
|
||||
$ time ractool -decode zlib.withdict.rac > /dev/null
|
||||
real 0m0.052s
|
||||
user 0m0.678s
|
||||
sys 0m0.036s
|
||||
|
||||
$ # A similar comparison can be made for Zstandard.
|
||||
$ time unzstd --stdout enwik8.zst > /dev/null
|
||||
real 0m0.203s
|
||||
user 0m0.187s
|
||||
sys 0m0.016s
|
||||
$ time ractool -decode -singlethreaded zstd.withdict.rac > /dev/null
|
||||
real 0m0.235s
|
||||
user 0m0.206s
|
||||
sys 0m0.033s
|
||||
$ time ractool -decode zstd.withdict.rac > /dev/null
|
||||
real 0m0.037s
|
||||
user 0m0.374s
|
||||
sys 0m0.080s
|
||||
$ # A similar comparison can be made for Zstandard.
|
||||
$ time unzstd --stdout enwik8.zst > /dev/null
|
||||
real 0m0.203s
|
||||
user 0m0.187s
|
||||
sys 0m0.016s
|
||||
$ time ractool -decode -singlethreaded zstd.withdict.rac > /dev/null
|
||||
real 0m0.235s
|
||||
user 0m0.206s
|
||||
sys 0m0.033s
|
||||
$ time ractool -decode zstd.withdict.rac > /dev/null
|
||||
real 0m0.037s
|
||||
user 0m0.374s
|
||||
sys 0m0.080s
|
||||
|
||||
$ # For reference, LZ4 numbers.
|
||||
$ time ractool -decode -singlethreaded lz4.sansdict.rac > /dev/null
|
||||
real 0m0.072s
|
||||
user 0m0.053s
|
||||
sys 0m0.021s
|
||||
$ time ractool -decode lz4.sansdict.rac > /dev/null
|
||||
real 0m0.024s
|
||||
user 0m0.097s
|
||||
sys 0m0.034s
|
||||
--------
|
||||
$ # For reference, LZ4 numbers.
|
||||
$ time ractool -decode -singlethreaded lz4.sansdict.rac > /dev/null
|
||||
real 0m0.072s
|
||||
user 0m0.053s
|
||||
sys 0m0.021s
|
||||
$ time ractool -decode lz4.sansdict.rac > /dev/null
|
||||
real 0m0.024s
|
||||
user 0m0.097s
|
||||
sys 0m0.034s
|
||||
--------
|
||||
*/
|
||||
package main
|
||||
|
||||
|
||||
Reference in new issue
Block a user