Page MenuHomeFreeBSD
Files F144372943

D38208.id115788.diff
No OneTemporary
Actions

D38208.id115788.diff
View Options

Index: ./lib/libzstd/Makefile
===================================================================
--- ./lib/libzstd/Makefile
+++ ./lib/libzstd/Makefile
@@ -34,7 +34,7 @@
hist.c \
fastcover.c
WARNS?= 2
-INCS= zstd.h
+INCS= pool.h zstd.h
CFLAGS+= -I${ZSTDDIR}/lib -I${ZSTDDIR}/lib/common -DXXH_NAMESPACE=ZSTD_ \
-DZSTD_MULTITHREAD=1 -fvisibility=hidden
LIBADD= pthread
Index: ./sys/kern/subr_compressor.c
===================================================================
--- ./sys/kern/subr_compressor.c
+++ ./sys/kern/subr_compressor.c
@@ -338,7 +338,13 @@
size_t res;
s = stream;
- res = ZSTD_resetCStream(s->zst_stream, 0);
+
+ res = ZSTD_CCtx_reset(s->zst_stream, ZSTD_reset_session_only);
+ if (ZSTD_isError(res))
+ panic("%s: could not reset stream %p: %s\n", __func__, s,
+ ZSTD_getErrorName(res));
+
+ res = ZSTD_CCtx_setPledgedSrcSize(s->zst_stream, ZSTD_CONTENTSIZE_UNKNOWN);
if (ZSTD_isError(res))
panic("%s: could not reset stream %p: %s\n", __func__, s,
ZSTD_getErrorName(res));
Index: ./usr.bin/zstd/Makefile
===================================================================
--- ./usr.bin/zstd/Makefile
+++ ./usr.bin/zstd/Makefile
@@ -7,10 +7,13 @@
datagen.c \
dibio.c \
fileio.c \
+ fileio_asyncio.c \
timefn.c \
util.c \
+ xxhash.c \
zstdcli.c
+INCS= fileio.h
CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/programs \
-I${SRCTOP}/sys/contrib/zstd/lib/common \
-I${SRCTOP}/sys/contrib/zstd/lib/compress \
@@ -18,7 +21,10 @@
-I${SRCTOP}/sys/contrib/zstd/lib \
-DXXH_NAMESPACE=ZSTD_ \
-DHAVE_THREAD=1 \
- -DZSTD_MULTITHREAD=1
+ -DZSTD_MULTITHREAD=1 \
+ -DZSTD_NOTRACE=1 \
+ -DBACKTRACE_ENABLE=0
+
LINKS= ${BINDIR}/zstd ${BINDIR}/unzstd \
${BINDIR}/zstd ${BINDIR}/zstdcat \
${BINDIR}/zstd ${BINDIR}/zstdmt

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 2:46 AM (9 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28528384
Default Alt Text
D38208.id115788.diff (1 KB)

Event Timeline