extzstd 0.3.3 → 0.4

data/ext/extzstd_stream.c

@@ -9,12 +9,13 @@ enum {
 };
 
 static inline VALUE
-aux_str_buf_recycle(VALUE str, size_t capacity)
+aux_str_buf_recycle(VALUE *str, size_t capacity)
 {
-    if (!RTEST(str) || rb_obj_frozen_p(str) || !rb_type_p(str, RUBY_T_STRING)) {
-        return rb_str_buf_new(capacity);
+    if (!RTEST(*str) || rb_obj_frozen_p(*str) || !rb_type_p(*str, RUBY_T_STRING)) {
+        *str = rb_str_buf_new(capacity);
+        return *str;
     } else {
-        return aux_str_modify_expand(str, capacity);
+        return aux_str_modify_expand(*str, capacity);
     }
 }
 
@@ -128,10 +129,6 @@ enc_init(int argc, VALUE argv[], VALUE self)
                 rb_obj_classname(self), (void *)self);
     }
 
-    AUX_TRY_WITH_GC(
-            p->context = ZSTD_createCStream(),
-            "failed ZSTD_createCStream()");
-
     const void *predictp;
     size_t predictsize;
     if (NIL_P(predict)) {
@@ -143,13 +140,39 @@ enc_init(int argc, VALUE argv[], VALUE self)
         RSTRING_GETMEM(predict, predictp, predictsize);
     }
 
+    AUX_TRY_WITH_GC(
+            p->context = ZSTD_createCStream(),
+            "failed ZSTD_createCStream()");
+
     if (extzstd_params_p(params)) {
         ZSTD_parameters *paramsp = extzstd_getparams(params);
-        size_t s = ZSTD_initCStream_advanced(p->context, predictp, predictsize, *paramsp, -1);
-        extzstd_check_error(s);
+        ZSTD_CCtx *zstd = p->context;
+        p->context = NULL; // 一時的に無効化する
+
+        aux_ZSTD_CCtx_reset(zstd, ZSTD_reset_session_and_parameters);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_windowLog, paramsp->cParams.windowLog);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_chainLog, paramsp->cParams.chainLog);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_hashLog, paramsp->cParams.hashLog);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_searchLog, paramsp->cParams.searchLog);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_minMatch, paramsp->cParams.minMatch);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_targetLength, paramsp->cParams.targetLength);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_strategy, paramsp->cParams.strategy);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_contentSizeFlag, paramsp->fParams.contentSizeFlag);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_checksumFlag, paramsp->fParams.checksumFlag);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_dictIDFlag, !paramsp->fParams.noDictIDFlag);
+        aux_ZSTD_CCtx_loadDictionary(zstd, predictp, predictsize);
+
+        p->context = zstd;
     } else {
-        size_t s = ZSTD_initCStream_usingDict(p->context, predictp, predictsize, aux_num2int(params, 1));
-        extzstd_check_error(s);
+        int clevel = aux_num2int(params, ZSTD_CLEVEL_DEFAULT);
+        ZSTD_CCtx *zstd = p->context;
+        p->context = NULL; // 一時的に無効化する
+
+        aux_ZSTD_CCtx_reset(zstd, ZSTD_reset_session_and_parameters);
+        aux_ZSTD_CCtx_setParameter(zstd, ZSTD_c_compressionLevel, clevel);
+        aux_ZSTD_CCtx_loadDictionary(zstd, predictp, predictsize);
+
+        p->context = zstd;
     }
 
     p->predict = predict;
@@ -170,7 +193,7 @@ enc_write(VALUE self, VALUE src)
     ZSTD_inBuffer input = { RSTRING_PTR(src), RSTRING_LEN(src), 0 };
 
     while (input.pos < input.size) {
-        p->destbuf = aux_str_buf_recycle(p->destbuf, ZSTD_CStreamOutSize() * 2);
+        aux_str_buf_recycle(&p->destbuf, ZSTD_CStreamOutSize() * 2);
         rb_str_set_len(p->destbuf, 0);
         rb_obj_infect(self, src);
         rb_obj_infect(p->destbuf, self);
@@ -195,7 +218,7 @@ enc_sync(VALUE self)
      */
 
     struct encoder *p = encoder_context(self);
-    aux_str_buf_recycle(p->destbuf, ZSTD_CStreamOutSize());
+    aux_str_buf_recycle(&p->destbuf, ZSTD_CStreamOutSize());
     rb_str_set_len(p->destbuf, 0);
     rb_obj_infect(p->destbuf, self);
     ZSTD_outBuffer output = { RSTRING_PTR(p->destbuf), rb_str_capacity(p->destbuf), 0 };
@@ -216,7 +239,7 @@ enc_close(VALUE self)
      */
 
     struct encoder *p = encoder_context(self);
-    aux_str_buf_recycle(p->destbuf, ZSTD_CStreamOutSize());
+    aux_str_buf_recycle(&p->destbuf, ZSTD_CStreamOutSize());
     rb_str_set_len(p->destbuf, 0);
     rb_obj_infect(p->destbuf, self);
     ZSTD_outBuffer output = { RSTRING_PTR(p->destbuf), rb_str_capacity(p->destbuf), 0 };
@@ -241,11 +264,18 @@ static VALUE
 enc_reset(VALUE self, VALUE pledged_srcsize)
 {
     /*
-     * ZSTDLIB_API size_t ZSTD_resetCStream(ZSTD_CStream* zcs, unsigned long long pledgedSrcSize);
+     * ZSTDLIB_API size_t ZSTD_CCtx_reset(ZSTD_CCtx* cctx, ZSTD_ResetDirective reset);
      */
 
-    size_t s = ZSTD_resetCStream(encoder_context(self)->context, NUM2ULL(pledged_srcsize));
+    size_t s = ZSTD_CCtx_reset(encoder_context(self)->context, ZSTD_reset_session_only);
     extzstd_check_error(s);
+
+    if (pledged_srcsize == Qnil) {
+        ZSTD_CCtx_setPledgedSrcSize(encoder_context(self)->context, ZSTD_CONTENTSIZE_UNKNOWN);
+    } else {
+        ZSTD_CCtx_setPledgedSrcSize(encoder_context(self)->context, NUM2ULL(pledged_srcsize));
+    }
+
     return self;
 }
 
@@ -281,6 +311,10 @@ init_encoder(void)
     rb_define_alias(cStreamEncoder, "flush", "sync");
     rb_define_alias(cStreamEncoder, "end", "close");
     rb_define_alias(cStreamEncoder, "finish", "close");
+
+    (void)encoder_alloc_dummy;
+    (void)getencoderp;
+    (void)encoder_p;
 }
 
 /*
@@ -291,7 +325,7 @@ static VALUE cStreamDecoder;
 
 struct decoder
 {
-    ZSTD_DStream *context;
+    ZSTD_DCtx *context;
     VALUE inport;
     VALUE readbuf;
     VALUE predict;
@@ -313,7 +347,7 @@ dec_free(void *pp)
 {
     struct decoder *p = (struct decoder *)pp;
     if (p->context) {
-        ZSTD_freeDStream(p->context);
+        ZSTD_freeDCtx(p->context);
         p->context = NULL;
     }
     xfree(p);
@@ -352,6 +386,8 @@ static VALUE
 dec_init(int argc, VALUE argv[], VALUE self)
 {
     /*
+     * ZSTDLIB_API size_t ZSTD_DCtx_loadDictionary(ZSTD_DCtx* dctx, const void* dict, size_t dictSize);
+     *
      * ZSTDLIB_API size_t ZSTD_initDStream(ZSTD_DStream* zds);
      * ZSTDLIB_API size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t dictSize);
      */
@@ -379,16 +415,19 @@ dec_init(int argc, VALUE argv[], VALUE self)
     }
 
     AUX_TRY_WITH_GC(
-            p->context = ZSTD_createDStream(),
-            "failed ZSTD_createDStream()");
+            p->context = ZSTD_createDCtx(),
+            "failed ZSTD_createDCtx()");
 
+    //ZSTD_DCtx_reset
+    //ZSTD_DCtx_loadDictionary
     if (NIL_P(predict)) {
-        size_t s = ZSTD_initDStream(p->context);
-        extzstd_check_error(s);
+        //size_t s = ZSTD_initDStream(p->context);
+        //extzstd_check_error(s);
     } else {
         rb_check_type(predict, RUBY_T_STRING);
         predict = rb_str_new_frozen(predict);
-        size_t s = ZSTD_initDStream_usingDict(p->context, RSTRING_PTR(predict), RSTRING_LEN(predict));
+        //size_t s = ZSTD_initDStream_usingDict(p->context, RSTRING_PTR(predict), RSTRING_LEN(predict));
+        size_t s = ZSTD_DCtx_loadDictionary(p->context, RSTRING_PTR(predict), RSTRING_LEN(predict));
         extzstd_check_error(s);
     }
 
@@ -401,8 +440,8 @@ dec_init(int argc, VALUE argv[], VALUE self)
 static int
 dec_read_fetch(VALUE o, struct decoder *p)
 {
-    if (!p->inbuf.src || NIL_P(p->readbuf) || p->inbuf.pos >= RSTRING_LEN(p->readbuf)) {
-        p->readbuf = aux_str_buf_recycle(p->readbuf, EXT_PARTIAL_READ_SIZE);
+    if (!p->inbuf.src || NIL_P(p->readbuf) || p->inbuf.pos >= (size_t)RSTRING_LEN(p->readbuf)) {
+        aux_str_buf_recycle(&p->readbuf, EXT_PARTIAL_READ_SIZE);
         VALUE st = AUX_FUNCALL(p->inport, id_read, INT2FIX(EXT_PARTIAL_READ_SIZE), p->readbuf);
         if (NIL_P(st)) { return -1; }
         rb_check_type(st, RUBY_T_STRING);
@@ -420,13 +459,14 @@ dec_read_fetch(VALUE o, struct decoder *p)
 static size_t
 dec_read_decode(VALUE o, struct decoder *p, char *buf, ssize_t size)
 {
+
     if (p->reached_eof != 0) {
         return 0;
     }
 
     ZSTD_outBuffer output = { buf, size, 0 };
 
-    while (size < 0 || output.pos < size) {
+    while (size < 0 || output.pos < (size_t)size) {
         if (dec_read_fetch(o, p) != 0) {
             if (p->reached_eof == 0) {
                 rb_raise(rb_eRuntimeError,
@@ -563,10 +603,9 @@ dec_close(VALUE self)
 static VALUE
 dec_reset(VALUE self)
 {
-    /*
-     * ZSTDLIB_API size_t ZSTD_resetDStream(ZSTD_DStream* zds);
-     */
-    size_t s = ZSTD_resetDStream(decoder_context(self)->context);
+    //> ZSTDLIB_API size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset);
+
+    size_t s = ZSTD_DCtx_reset(decoder_context(self)->context, ZSTD_reset_session_only);
     extzstd_check_error(s);
     return self;
 }
@@ -605,6 +644,10 @@ init_decoder(void)
     rb_define_method(cStreamDecoder, "reset", dec_reset, 0);
     rb_define_method(cStreamDecoder, "sizeof", dec_sizeof, 0);
     rb_define_method(cStreamDecoder, "pos", dec_pos, 0);
+
+    (void)decoder_alloc_dummy;
+    (void)getdecoderp;
+    (void)decoder_p;
 }
 
 /*

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extzstd
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
 platform: ruby
 authors:
 - dearblue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,8 +71,8 @@ files:
 - contrib/zstd/Makefile
 - contrib/zstd/Package.swift
 - contrib/zstd/README.md
+- contrib/zstd/SECURITY.md
 - contrib/zstd/TESTING.md
-- contrib/zstd/appveyor.yml
 - contrib/zstd/lib/BUCK
 - contrib/zstd/lib/Makefile
 - contrib/zstd/lib/README.md
@@ -167,7 +167,6 @@ files:
 - contrib/zstd/lib/zdict.h
 - contrib/zstd/lib/zstd.h
 - contrib/zstd/lib/zstd_errors.h
-- ext/depend
 - ext/extconf.rb
 - ext/extzstd.c
 - ext/extzstd.h
@@ -214,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: ruby bindings for Zstandard (zstd)

data/contrib/zstd/appveyor.yml

@@ -1,205 +0,0 @@
-# Following tests are run _only_ on `release` branch
-# and on selected feature branch named `appveyorTest` or `visual*`
-
--
-  version: 1.0.{build}
-  branches:
-    only:
-    - release
-    - master
-    - /appveyor*/
-    - /visual*/
-  environment:
-    matrix:
-    - COMPILER: "gcc"
-      HOST:     "mingw"
-      PLATFORM: "x64"
-      SCRIPT:   "make allzstd MOREFLAGS=-static"
-      ARTIFACT: "true"
-      BUILD:    "true"
-    - COMPILER: "gcc"
-      HOST:     "mingw"
-      PLATFORM: "x86"
-      SCRIPT:   "make allzstd MOREFLAGS=-static"
-      ARTIFACT: "true"
-      BUILD:    "true"
-
-    - COMPILER: "clang-cl"
-      HOST:     "cmake-visual"
-      PLATFORM: "x64"
-      CONFIGURATION: "Release"
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      CMAKE_GENERATOR_PLATFORM: "x64"
-      CMAKE_GENERATOR_TOOLSET: "LLVM"
-      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-
-  install:
-  - ECHO Installing %COMPILER% %PLATFORM% %CONFIGURATION%
-  - SET PATH_ORIGINAL=%PATH%
-  - if [%HOST%]==[mingw] (
-      SET "PATH_MINGW32=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin" &&
-      SET "PATH_MINGW64=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin" &&
-      COPY C:\msys64\usr\bin\make.exe C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin\make.exe &&
-      COPY C:\msys64\usr\bin\make.exe C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin\make.exe
-    )
-  - IF [%HOST%]==[visual] IF [%PLATFORM%]==[x64] (
-      SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;"
-    )
-
-  build_script:
-  - if [%HOST%]==[mingw] (
-      ( if [%PLATFORM%]==[x64] (
-        SET "PATH=%PATH_MINGW64%;%PATH_ORIGINAL%"
-      ) else if [%PLATFORM%]==[x86] (
-        SET "PATH=%PATH_MINGW32%;%PATH_ORIGINAL%"
-      ) )
-    )
-  - if [%HOST%]==[mingw] if [%BUILD%]==[true] (
-      make -v &&
-      sh -c "%COMPILER% -v" &&
-      ECHO Building zlib to static link &&
-      SET "CC=%COMPILER%" &&
-      sh -c "cd .. && git clone --depth 1 --branch v1.2.11 https://github.com/madler/zlib" &&
-      sh -c "cd ../zlib && make -f win32/Makefile.gcc libz.a"
-      ECHO Building zstd &&
-      SET "CPPFLAGS=-I../../zlib" &&
-      SET "LDFLAGS=../../zlib/libz.a" &&
-      sh -c "%SCRIPT%" &&
-      ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true]
-          ECHO Creating artifacts &&
-          ECHO %cd% &&
-          lib\dll\example\build_package.bat &&
-          make -C programs DEBUGFLAGS= clean zstd &&
-          cd programs\ && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
-          appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip &&
-          cp zstd.exe ..\bin\zstd.exe &&
-          git clone --depth 1 --branch release https://github.com/facebook/zstd &&
-          cd zstd &&
-          git archive --format=tar release -o zstd-src.tar &&
-          ..\zstd -19 zstd-src.tar &&
-          appveyor PushArtifact zstd-src.tar.zst &&
-          certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.tar.zst.sha256.sig &&
-          appveyor PushArtifact zstd-src.tar.zst.sha256.sig &&
-          cd ..\..\bin\ &&
-          7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * &&
-          appveyor PushArtifact zstd-win-release-%PLATFORM%.zip
-      )
-    )
-  - if [%HOST%]==[cmake-visual] (
-      ECHO *** &&
-      ECHO *** Building %CMAKE_GENERATOR% ^(%CMAKE_GENERATOR_TOOLSET%^) %PLATFORM%\%CONFIGURATION% &&
-      PUSHD build\cmake &&
-      cmake -DBUILD_TESTING=ON . &&
-      cmake --build . --config %CONFIGURATION% -j4 &&
-      POPD &&
-      ECHO ***
-    )
-
-  test_script:
-  - ECHO Testing %COMPILER% %PLATFORM% %CONFIGURATION%
-  - SET "CC=gcc"
-  - SET "CXX=g++"
-  - if [%TEST%]==[cmake] (
-      mkdir build\cmake\build &&
-      cd build\cmake\build &&
-      SET FUZZERTEST=-T2mn &&
-      SET ZSTREAM_TESTTIME=-T2mn &&
-      cmake -G "Visual Studio 14 2015 Win64" .. &&
-      cd ..\..\.. &&
-      make clean
-    )
-
-
-# The following tests are for regular pushes
-# into `dev` or some feature branch
-# There run less tests, for shorter feedback loop
-
--
-  version: 1.0.{build}
-  environment:
-    matrix:
-    - COMPILER: "visual"
-      HOST:     "visual"
-      PLATFORM: "x64"
-      CONFIGURATION: "Debug"
-    - COMPILER: "visual"
-      HOST:     "visual"
-      PLATFORM: "Win32"
-      CONFIGURATION: "Debug"
-    - COMPILER: "visual"
-      HOST:     "visual"
-      PLATFORM: "x64"
-      CONFIGURATION: "Release"
-    - COMPILER: "visual"
-      HOST:     "visual"
-      PLATFORM: "Win32"
-      CONFIGURATION: "Release"
-
-    - COMPILER: "gcc"
-      HOST:     "cygwin"
-      PLATFORM: "x64"
-
-    - COMPILER: "clang-cl"
-      HOST:     "cmake-visual"
-      PLATFORM: "x64"
-      CONFIGURATION: "Release"
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      CMAKE_GENERATOR_PLATFORM: "x64"
-      CMAKE_GENERATOR_TOOLSET: "LLVM"
-      APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-
-  install:
-  - ECHO Installing %COMPILER% %PLATFORM% %CONFIGURATION%
-  - SET PATH_ORIGINAL=%PATH%
-  - if [%HOST%]==[cygwin] (
-      ECHO Installing Cygwin Packages &&
-      C:\cygwin64\setup-x86_64.exe -qnNdO -R "C:\cygwin64" -g -P ^
-        gcc,^
-        cmake,^
-        make
-    )
-  - IF [%HOST%]==[visual] IF [%PLATFORM%]==[x64] (
-      SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;"
-    )
-
-  build_script:
-  - ECHO Building %COMPILER% %PLATFORM% %CONFIGURATION%
-  - if [%HOST%]==[cygwin] (
-      set CHERE_INVOKING=yes &&
-      set CC=%COMPILER% &&
-      C:\cygwin64\bin\bash --login -c "
-        set -e;
-        cd build/cmake;
-        CFLAGS='-Werror' cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DZSTD_BUILD_TESTS:BOOL=ON -DZSTD_FUZZER_FLAGS=-T20s -DZSTD_ZSTREAM_FLAGS=-T20s -DZSTD_FULLBENCH_FLAGS=-i0 .;
-        make VERBOSE=1 -j;
-        ctest -V -L Medium;
-      "
-    )
-  - if [%HOST%]==[cmake-visual] (
-      ECHO *** &&
-      ECHO *** Building %CMAKE_GENERATOR% ^(%CMAKE_GENERATOR_TOOLSET%^) %PLATFORM%\%CONFIGURATION% &&
-      PUSHD build\cmake &&
-      cmake -DBUILD_TESTING=ON . &&
-      cmake --build . --config %CONFIGURATION% -j4 &&
-      POPD &&
-      ECHO ***
-    )
-  - if [%HOST%]==[visual] (
-      ECHO *** &&
-      ECHO *** Building Visual Studio 2012 %PLATFORM%\%CONFIGURATION% &&
-      ECHO *** &&
-      msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v110 /p:ForceImportBeforeCppTargets=%APPVEYOR_BUILD_FOLDER%\build\VS2010\CompileAsCpp.props /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
-      DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe &&
-      msbuild "build\VS2010\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=v110 /t:Clean,Build /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" &&
-      DIR build\VS2010\bin\%PLATFORM%_%CONFIGURATION%\*.exe
-    )
-
-
-  test_script:
-  - ECHO Testing %COMPILER% %PLATFORM% %CONFIGURATION%
-  - SET "FUZZERTEST=-T10s"
-  - if [%HOST%]==[mingw] (
-      set "CC=%COMPILER%" &&
-      make clean &&
-      make check
-    )

data/ext/depend

@@ -1,2 +0,0 @@
-extzstd.o: extzstd.c extzstd.h
-extzstd_stream.o: extzstd_stream.c extzstd.h extzstd_nogvls.h