Date: Fri, 25 Dec 2020 17:58:50 +0100 From: Oliver Pinter <oliver.pntr@gmail.com> To: Conrad Meyer <cem@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: f7cd7fe51c41 - sys/contrib/zstd: Import zstd 1.4.8 Message-ID: <CAPjTQNGBcMCQf1ibXscdAwnL6hBLQyhXcnGVO3QhXqVaOTkX7Q@mail.gmail.com> In-Reply-To: <202012251556.0BPFu9l7029902@gitrepo.freebsd.org> References: <202012251556.0BPFu9l7029902@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday, December 25, 2020, Conrad Meyer <cem@freebsd.org> wrote: > The branch main has been updated by cem: > > URL: https://cgit.FreeBSD.org/src/commit/?id= > f7cd7fe51c4140960ebea00410ed62894f5625d1 > > commit f7cd7fe51c4140960ebea00410ed62894f5625d1 > Merge: dc505d53dcc1 f6ae97673c28 > Author: Conrad Meyer <cem@FreeBSD.org> > AuthorDate: 2020-12-25 15:42:41 +0000 > Commit: Conrad Meyer <cem@FreeBSD.org> > CommitDate: 2020-12-25 15:42:41 +0000 > > sys/contrib/zstd: Import zstd 1.4.8 > > Merge commit 'f6ae97673c28bdb9ae795bd235ab6f26f2536a2d' into main > > Changes from 1.4.5: > * https://github.com/facebook/zstd/releases/tag/v1.4.8 > * https://github.com/facebook/zstd/releases/tag/v1.4.7 > (and there was no public v1.4.6) > > Conflicts: > sys/contrib/zstd/lib/common/zstd_internal.h (new > ZSTD_NO_INTRINSICS) Next time it would be nice to rebase to the most recent master. With the rebase, you could avoid the merge conflicts. > > sys/conf/kern.pre.mk | 6 +- > sys/contrib/zstd/CHANGELOG | 173 +- > sys/contrib/zstd/CONTRIBUTING.md | 18 +- > sys/contrib/zstd/Makefile | 68 +- > sys/contrib/zstd/README.md | 12 +- > sys/contrib/zstd/TESTING.md | 2 +- > sys/contrib/zstd/appveyor.yml | 19 +- > sys/contrib/zstd/doc/zstd_compression_format.md | 114 +- > sys/contrib/zstd/doc/zstd_manual.html | 314 +++- > sys/contrib/zstd/examples/Makefile | 53 +- > sys/contrib/zstd/examples/streaming_compression.c | 1 + > .../examples/streaming_compression_thread_pool.c | 178 ++ > sys/contrib/zstd/lib/Makefile | 365 ++-- > sys/contrib/zstd/lib/README.md | 28 + > sys/contrib/zstd/lib/common/bitstream.h | 39 +- > sys/contrib/zstd/lib/common/compiler.h | 119 +- > sys/contrib/zstd/lib/common/cpu.h | 2 - > sys/contrib/zstd/lib/common/debug.h | 29 +- > sys/contrib/zstd/lib/common/entropy_common.c | 230 ++- > sys/contrib/zstd/lib/common/error_private.c | 1 + > sys/contrib/zstd/lib/common/error_private.h | 2 +- > sys/contrib/zstd/lib/common/fse.h | 50 +- > sys/contrib/zstd/lib/common/fse_decompress.c | 139 +- > sys/contrib/zstd/lib/common/huf.h | 31 +- > sys/contrib/zstd/lib/common/mem.h | 159 +- > sys/contrib/zstd/lib/common/pool.c | 38 +- > sys/contrib/zstd/lib/common/pool.h | 2 +- > sys/contrib/zstd/lib/common/threading.c | 11 +- > sys/contrib/zstd/lib/common/xxhash.c | 74 +- > sys/contrib/zstd/lib/common/xxhash.h | 2 +- > sys/contrib/zstd/lib/common/zstd_common.c | 18 +- > sys/contrib/zstd/lib/common/zstd_deps.h | 111 ++ > sys/contrib/zstd/lib/common/zstd_errors.h | 1 + > sys/contrib/zstd/lib/common/zstd_internal.h | 147 +- > sys/contrib/zstd/lib/compress/fse_compress.c | 53 +- > sys/contrib/zstd/lib/compress/hist.c | 54 +- > sys/contrib/zstd/lib/compress/hist.h | 2 +- > sys/contrib/zstd/lib/compress/huf_compress.c | 316 ++-- > sys/contrib/zstd/lib/compress/zstd_compress.c | 1750 > +++++++++++++++----- > .../zstd/lib/compress/zstd_compress_internal.h | 160 +- > .../zstd/lib/compress/zstd_compress_literals.c | 8 +- > .../zstd/lib/compress/zstd_compress_sequences.c | 20 +- > .../zstd/lib/compress/zstd_compress_superblock.c | 42 +- > sys/contrib/zstd/lib/compress/zstd_cwksp.h | 84 +- > sys/contrib/zstd/lib/compress/zstd_double_fast.c | 44 +- > sys/contrib/zstd/lib/compress/zstd_fast.c | 38 +- > sys/contrib/zstd/lib/compress/zstd_lazy.c | 428 ++++- > sys/contrib/zstd/lib/compress/zstd_lazy.h | 20 + > sys/contrib/zstd/lib/compress/zstd_ldm.c | 77 +- > sys/contrib/zstd/lib/compress/zstd_ldm.h | 6 + > sys/contrib/zstd/lib/compress/zstd_opt.c | 235 ++- > sys/contrib/zstd/lib/compress/zstdmt_compress.c | 480 +----- > sys/contrib/zstd/lib/compress/zstdmt_compress.h | 134 +- > sys/contrib/zstd/lib/decompress/huf_decompress.c | 502 +++--- > sys/contrib/zstd/lib/decompress/zstd_ddict.c | 16 +- > sys/contrib/zstd/lib/decompress/zstd_ddict.h | 2 +- > sys/contrib/zstd/lib/decompress/zstd_decompress.c | 205 ++- > .../zstd/lib/decompress/zstd_decompress_block.c | 184 +- > .../zstd/lib/decompress/zstd_decompress_block.h | 7 +- > .../zstd/lib/decompress/zstd_decompress_internal.h | 21 +- > sys/contrib/zstd/lib/dictBuilder/cover.c | 49 +- > sys/contrib/zstd/lib/dictBuilder/cover.h | 2 +- > sys/contrib/zstd/lib/dictBuilder/fastcover.c | 39 +- > sys/contrib/zstd/lib/dictBuilder/zdict.c | 31 +- > sys/contrib/zstd/lib/dictBuilder/zdict.h | 2 +- > sys/contrib/zstd/lib/legacy/zstd_v01.c | 6 +- > sys/contrib/zstd/lib/legacy/zstd_v02.c | 6 +- > sys/contrib/zstd/lib/legacy/zstd_v03.c | 6 +- > sys/contrib/zstd/lib/legacy/zstd_v04.c | 8 +- > sys/contrib/zstd/lib/legacy/zstd_v05.c | 6 +- > sys/contrib/zstd/lib/legacy/zstd_v06.c | 6 +- > sys/contrib/zstd/lib/legacy/zstd_v07.c | 6 +- > sys/contrib/zstd/lib/libzstd.pc.in | 6 +- > sys/contrib/zstd/lib/zstd.h | 395 ++++- > sys/contrib/zstd/programs/Makefile | 284 ++-- > sys/contrib/zstd/programs/README.md | 70 +- > sys/contrib/zstd/programs/dibio.c | 2 +- > sys/contrib/zstd/programs/fileio.c | 462 ++++-- > sys/contrib/zstd/programs/fileio.h | 29 +- > sys/contrib/zstd/programs/platform.h | 6 + > sys/contrib/zstd/programs/timefn.h | 6 +- > sys/contrib/zstd/programs/util.c | 407 ++++- > sys/contrib/zstd/programs/util.h | 62 +- > sys/contrib/zstd/programs/zstd.1 | 77 +- > sys/contrib/zstd/programs/zstd.1.md | 150 +- > sys/contrib/zstd/programs/zstdcli.c | 195 ++- > sys/contrib/zstd/programs/zstdgrep.1 | 2 +- > sys/contrib/zstd/programs/zstdless.1 | 2 +- > sys/contrib/zstd/zlibWrapper/Makefile | 4 +- > sys/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c | 137 +- > 90 files changed, 6825 insertions(+), 3082 deletions(-) > > > Trim
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPjTQNGBcMCQf1ibXscdAwnL6hBLQyhXcnGVO3QhXqVaOTkX7Q>