extzstd 0.3.1 → 0.3.3

data/contrib/zstd/lib/{common/zstd_errors.h → zstd_errors.h}

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020, Yann Collet, Facebook, Inc.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  * All rights reserved.
  *
  * This source code is licensed under both the BSD-style license (found in the
@@ -20,19 +20,31 @@ extern "C" {
 
 
 /* =====   ZSTDERRORLIB_API : control library symbols visibility   ===== */
-#ifndef ZSTDERRORLIB_VISIBILITY
-#  if defined(__GNUC__) && (__GNUC__ >= 4)
-#    define ZSTDERRORLIB_VISIBILITY __attribute__ ((visibility ("default")))
+#ifndef ZSTDERRORLIB_VISIBLE
+   /* Backwards compatibility with old macro name */
+#  ifdef ZSTDERRORLIB_VISIBILITY
+#    define ZSTDERRORLIB_VISIBLE ZSTDERRORLIB_VISIBILITY
+#  elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
+#    define ZSTDERRORLIB_VISIBLE __attribute__ ((visibility ("default")))
 #  else
-#    define ZSTDERRORLIB_VISIBILITY
+#    define ZSTDERRORLIB_VISIBLE
 #  endif
 #endif
+
+#ifndef ZSTDERRORLIB_HIDDEN
+#  if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
+#    define ZSTDERRORLIB_HIDDEN __attribute__ ((visibility ("hidden")))
+#  else
+#    define ZSTDERRORLIB_HIDDEN
+#  endif
+#endif
+
 #if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
-#  define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBILITY
+#  define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBLE
 #elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
-#  define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
+#  define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
 #else
-#  define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY
+#  define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBLE
 #endif
 
 /*-*********************************************
@@ -58,14 +70,17 @@ typedef enum {
   ZSTD_error_frameParameter_windowTooLarge = 16,
   ZSTD_error_corruption_detected = 20,
   ZSTD_error_checksum_wrong      = 22,
+  ZSTD_error_literals_headerWrong = 24,
   ZSTD_error_dictionary_corrupted      = 30,
   ZSTD_error_dictionary_wrong          = 32,
   ZSTD_error_dictionaryCreation_failed = 34,
   ZSTD_error_parameter_unsupported   = 40,
+  ZSTD_error_parameter_combination_unsupported = 41,
   ZSTD_error_parameter_outOfBound    = 42,
   ZSTD_error_tableLog_tooLarge       = 44,
   ZSTD_error_maxSymbolValue_tooLarge = 46,
   ZSTD_error_maxSymbolValue_tooSmall = 48,
+  ZSTD_error_stabilityCondition_notRespected = 50,
   ZSTD_error_stage_wrong       = 60,
   ZSTD_error_init_missing      = 62,
   ZSTD_error_memory_allocation = 64,
@@ -73,10 +88,15 @@ typedef enum {
   ZSTD_error_dstSize_tooSmall = 70,
   ZSTD_error_srcSize_wrong    = 72,
   ZSTD_error_dstBuffer_null   = 74,
+  ZSTD_error_noForwardProgress_destFull = 80,
+  ZSTD_error_noForwardProgress_inputEmpty = 82,
   /* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
   ZSTD_error_frameIndex_tooLarge = 100,
   ZSTD_error_seekableIO          = 102,
   ZSTD_error_dstBuffer_wrong     = 104,
+  ZSTD_error_srcBuffer_wrong     = 105,
+  ZSTD_error_sequenceProducer_failed = 106,
+  ZSTD_error_externalSequences_invalid = 107,
   ZSTD_error_maxCode = 120  /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
 } ZSTD_ErrorCode;
 

data/ext/extconf.rb

@@ -10,12 +10,13 @@ $INCFLAGS = %w(
   -I$(srcdir)/../contrib/zstd/lib/legacy
 ).join(" ") + " #$INCFLAGS"
 
-#dir = File.dirname(__FILE__).gsub(/[\[\{\?\*]/, "[\\0]")
-#filepattern = "{.,../contrib/zstd}/**/*.c"
-#target = File.join(dir, filepattern)
-#files = Dir.glob(target).sort.map { |n| File.basename n }
-#$srcs = files
-#$VPATH.push "$(srcdir)/../contrib/zstd", "$(srcdir)/../contrib/zstd/legacy"
+#if libzstd が 1.5.1 以降で gcc/clang であれば
+  dir = __dir__
+  dir1 = dir.gsub(/[\[\{\?\*]/, "[\\0]")
+  filepattern = "**/*.[cS]"
+  target = File.join(dir1, filepattern)
+  $srcs = Dir.glob(target).sort
+#end
 
 if RbConfig::CONFIG["arch"] =~ /mingw/i
   $LDFLAGS << " -static-libgcc" if try_ldflags("-static-libgcc")

data/ext/extzstd.c

@@ -3,6 +3,10 @@
 #include <zstd_errors.h>
 #include <zdict.h>
 
+#ifndef RB_EXT_RACTOR_SAFE
+# define RB_EXT_RACTOR_SAFE(FEATURE) ((void)(FEATURE))
+#endif
+
 VALUE extzstd_mZstd;
 
 static ID id_initialize;
@@ -167,13 +171,14 @@ init_constants(void)
     rb_define_const(mConstants, "ZSTD_HASHLOG_MIN", INT2NUM(ZSTD_HASHLOG_MIN));
     rb_define_const(mConstants, "ZSTD_CHAINLOG_MAX", INT2NUM(ZSTD_CHAINLOG_MAX));
     rb_define_const(mConstants, "ZSTD_CHAINLOG_MIN", INT2NUM(ZSTD_CHAINLOG_MIN));
-    rb_define_const(mConstants, "ZSTD_HASHLOG3_MAX", INT2NUM(ZSTD_HASHLOG3_MAX));
     rb_define_const(mConstants, "ZSTD_SEARCHLOG_MAX", INT2NUM(ZSTD_SEARCHLOG_MAX));
     rb_define_const(mConstants, "ZSTD_SEARCHLOG_MIN", INT2NUM(ZSTD_SEARCHLOG_MIN));
-    //rb_define_const(mConstants, "ZSTD_SEARCHLENGTH_MAX", INT2NUM(ZSTD_SEARCHLENGTH_MAX));
-    //rb_define_const(mConstants, "ZSTD_SEARCHLENGTH_MIN", INT2NUM(ZSTD_SEARCHLENGTH_MIN));
-    //rb_define_const(mConstants, "ZSTD_TARGETLENGTH_MAX", INT2NUM(ZSTD_TARGETLENGTH_MAX));
-    //rb_define_const(mConstants, "ZSTD_TARGETLENGTH_MIN", INT2NUM(ZSTD_TARGETLENGTH_MIN));
+    rb_define_const(mConstants, "ZSTD_MINMATCH_MAX", INT2NUM(ZSTD_MINMATCH_MAX));
+    rb_define_const(mConstants, "ZSTD_MINMATCH_MIN", INT2NUM(ZSTD_MINMATCH_MIN));
+    rb_define_const(mConstants, "ZSTD_TARGETLENGTH_MAX", INT2NUM(ZSTD_TARGETLENGTH_MAX));
+    rb_define_const(mConstants, "ZSTD_TARGETLENGTH_MIN", INT2NUM(ZSTD_TARGETLENGTH_MIN));
+    rb_define_const(mConstants, "ZSTD_STRATEGY_MIN", INT2NUM(ZSTD_STRATEGY_MIN));
+    rb_define_const(mConstants, "ZSTD_STRATEGY_MAX", INT2NUM(ZSTD_STRATEGY_MAX));
 
     rb_define_const(mConstants, "FAST", INT2NUM(ZSTD_fast));
     rb_define_const(mConstants, "DFAST", INT2NUM(ZSTD_dfast));
@@ -190,13 +195,15 @@ init_constants(void)
     rb_define_const(mConstants, "HASHLOG_MIN", INT2NUM(ZSTD_HASHLOG_MIN));
     rb_define_const(mConstants, "CHAINLOG_MAX", INT2NUM(ZSTD_CHAINLOG_MAX));
     rb_define_const(mConstants, "CHAINLOG_MIN", INT2NUM(ZSTD_CHAINLOG_MIN));
-    rb_define_const(mConstants, "HASHLOG3_MAX", INT2NUM(ZSTD_HASHLOG3_MAX));
     rb_define_const(mConstants, "SEARCHLOG_MAX", INT2NUM(ZSTD_SEARCHLOG_MAX));
     rb_define_const(mConstants, "SEARCHLOG_MIN", INT2NUM(ZSTD_SEARCHLOG_MIN));
-    //rb_define_const(mConstants, "SEARCHLENGTH_MAX", INT2NUM(ZSTD_SEARCHLENGTH_MAX));
-    //rb_define_const(mConstants, "SEARCHLENGTH_MIN", INT2NUM(ZSTD_SEARCHLENGTH_MIN));
-    //rb_define_const(mConstants, "TARGETLENGTH_MAX", INT2NUM(ZSTD_TARGETLENGTH_MAX));
-    //rb_define_const(mConstants, "TARGETLENGTH_MIN", INT2NUM(ZSTD_TARGETLENGTH_MIN));
+    rb_define_const(mConstants, "MINMATCH_MAX", INT2NUM(ZSTD_MINMATCH_MAX));
+    rb_define_const(mConstants, "MINMATCH_MIN", INT2NUM(ZSTD_MINMATCH_MIN));
+    rb_define_const(mConstants, "TARGETLENGTH_MAX", INT2NUM(ZSTD_TARGETLENGTH_MAX));
+    rb_define_const(mConstants, "TARGETLENGTH_MIN", INT2NUM(ZSTD_TARGETLENGTH_MIN));
+    rb_define_const(mConstants, "STRATEGY_MIN", INT2NUM(ZSTD_STRATEGY_MIN));
+    rb_define_const(mConstants, "STRATEGY_MAX", INT2NUM(ZSTD_STRATEGY_MAX));
+
 }
 
 /*
@@ -613,6 +620,8 @@ init_contextless(void)
 RBEXT_API void
 Init_extzstd(void)
 {
+    RB_EXT_RACTOR_SAFE(true);
+
     id_initialize = rb_intern("initialize");
     id_error_code = rb_intern("error_code");
 

data/ext/extzstd.h

@@ -7,8 +7,10 @@
 #include <common/zstd_internal.h> /* for MIN() */
 #include <zstd.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include <ruby/thread.h>
+#include <ruby/version.h>
 
 #define ELEMENTOF(ARRAY) (sizeof(ARRAY) / sizeof(ARRAY[0]))
 #define ENDOF(ARRAY) (ARRAY + ELEMENTOF(ARRAY))
@@ -226,4 +228,8 @@ aux_string_expand_pointer(VALUE str, char **ptr, size_t size)
     *ptr = RSTRING_PTR(str);
 }
 
+#if RUBY_API_VERSION_CODE >= 30000
+# define rb_obj_infect(dest, src) ((void)(dest), (void)(src))
+#endif
+
 #endif /* EXTZSTD_H */

data/ext/libzstd_conf.h

@@ -2,7 +2,6 @@
 #define RUBY_ZSTD_LIBZSTD_CONF_H 1
 
 #define ZSTD_LEGACY_SUPPORT 1
-#define MEM_MODULE 1
 #define visibility(v) visibility("hidden")
 
 #endif /* RUBY_ZSTD_LIBZSTD_CONF_H */

data/ext/zstd_decompress_asm.S

@@ -0,0 +1 @@
+#include "../contrib/zstd/lib/decompress/huf_decompress_amd64.S"

data/gemstub.rb

@@ -1,13 +1,8 @@
-verreg = /^\s*\*\s+version:\s*(\d+(?:\.\w+)+)\s*$/i
-unless File.read("README.md", mode: "rt") =~ verreg
-  raise "``version'' is not defined or bad syntax in ``README.md''"
-end
-
-version = String($1)
+require_relative "lib/extzstd/version"
 
 GEMSTUB = Gem::Specification.new do |s|
   s.name = "extzstd"
-  s.version = version
+  s.version = Zstd::VERSION
   s.summary = "ruby bindings for Zstandard (zstd)"
   s.description = <<EOS
 unoficial ruby bindings for Zstandard (zstd) <https://github.com/facebook/zstd>.
@@ -15,25 +10,12 @@ EOS
   s.homepage = "https://github.com/dearblue/ruby-extzstd/"
   s.license = "BSD-2-Clause"
   s.author = "dearblue"
-  s.email = "dearblue@users.noreply.github.com"
+  s.email = "dearblue@users.osdn.me"
 
   s.required_ruby_version = ">= 2.0"
   s.add_development_dependency "rake", ">= 12.0"
 end
 
-LIB << "lib/extzstd/version.rb"
-
-file "lib/extzstd/version.rb" => %w(README.md) do
-  GEMSTUB.version = version
-
-  mkpath "lib/extzstd"
-  File.write "lib/extzstd/version.rb", <<-"EOS", mode: "wb"
-module Zstd
-  VERSION = #{version.inspect}
-end
-  EOS
-end
-
 EXTRA.concat(FileList["contrib/**/*"])
 
 filter = %r(contrib/zstd/(?:build|contrib|doc|examples|lib/dll|programs|tests|zlibWrapper))

data/lib/extzstd/version.rb

@@ -1,3 +1,8 @@
 module Zstd
-  VERSION = "0.3.1"
+  verreg = /^\s*[\-\*]\s+version:\s*(\d+(?:\.\w+)+)\s*$/i
+  unless File.read("#{__dir__}/../../README.md", mode: "rt") =~ verreg
+    raise "``version'' is not defined or bad syntax in ``README.md''"
+  end
+
+  VERSION = String($1)
 end

data/lib/extzstd.rb

@@ -4,8 +4,6 @@ ver = RUBY_VERSION.slice(/\d+\.\d+/)
 soname = File.basename(__FILE__, ".rb") << ".so"
 require File.join(ver, soname)
 
-require_relative "extzstd/version"
-
 require "stringio"
 
 #

data/test/test_basic.rb

@@ -9,11 +9,6 @@ class TestZstd < Test::Unit::TestCase
     src = "ABCDEFGabcdefg" * 50
     assert_equal(src, Zstd.decode(Zstd.encode(src), src.bytesize))
     #assert_raise(Zstd::Error) { Zstd.decode("", 1111) }
-    d1 = Zstd.encode(src)
-    assert_same(src.tainted?, Zstd.encode(src).tainted?)
-    src1 = src.dup
-    src1.taint
-    assert_same(src1.tainted?, Zstd.encode(src1).tainted?)
   end
 
   def test_huge

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extzstd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - dearblue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,7 +27,7 @@ dependencies:
 description: 'unoficial ruby bindings for Zstandard (zstd) <https://github.com/facebook/zstd>.
 
   '
-email: dearblue@users.noreply.github.com
+email: dearblue@users.osdn.me
 executables: []
 extensions:
 - ext/extconf.rb
@@ -69,12 +69,15 @@ files:
 - contrib/zstd/COPYING
 - contrib/zstd/LICENSE
 - contrib/zstd/Makefile
+- contrib/zstd/Package.swift
 - contrib/zstd/README.md
 - contrib/zstd/TESTING.md
 - contrib/zstd/appveyor.yml
 - contrib/zstd/lib/BUCK
 - contrib/zstd/lib/Makefile
 - contrib/zstd/lib/README.md
+- contrib/zstd/lib/common/allocations.h
+- contrib/zstd/lib/common/bits.h
 - contrib/zstd/lib/common/bitstream.h
 - contrib/zstd/lib/common/compiler.h
 - contrib/zstd/lib/common/cpu.h
@@ -89,13 +92,16 @@ files:
 - contrib/zstd/lib/common/mem.h
 - contrib/zstd/lib/common/pool.c
 - contrib/zstd/lib/common/pool.h
+- contrib/zstd/lib/common/portability_macros.h
 - contrib/zstd/lib/common/threading.c
 - contrib/zstd/lib/common/threading.h
 - contrib/zstd/lib/common/xxhash.c
 - contrib/zstd/lib/common/xxhash.h
 - contrib/zstd/lib/common/zstd_common.c
-- contrib/zstd/lib/common/zstd_errors.h
+- contrib/zstd/lib/common/zstd_deps.h
 - contrib/zstd/lib/common/zstd_internal.h
+- contrib/zstd/lib/common/zstd_trace.h
+- contrib/zstd/lib/compress/clevels.h
 - contrib/zstd/lib/compress/fse_compress.c
 - contrib/zstd/lib/compress/hist.c
 - contrib/zstd/lib/compress/hist.h
@@ -117,11 +123,13 @@ files:
 - contrib/zstd/lib/compress/zstd_lazy.h
 - contrib/zstd/lib/compress/zstd_ldm.c
 - contrib/zstd/lib/compress/zstd_ldm.h
+- contrib/zstd/lib/compress/zstd_ldm_geartab.h
 - contrib/zstd/lib/compress/zstd_opt.c
 - contrib/zstd/lib/compress/zstd_opt.h
 - contrib/zstd/lib/compress/zstdmt_compress.c
 - contrib/zstd/lib/compress/zstdmt_compress.h
 - contrib/zstd/lib/decompress/huf_decompress.c
+- contrib/zstd/lib/decompress/huf_decompress_amd64.S
 - contrib/zstd/lib/decompress/zstd_ddict.c
 - contrib/zstd/lib/decompress/zstd_ddict.h
 - contrib/zstd/lib/decompress/zstd_decompress.c
@@ -138,7 +146,6 @@ files:
 - contrib/zstd/lib/dictBuilder/divsufsort.h
 - contrib/zstd/lib/dictBuilder/fastcover.c
 - contrib/zstd/lib/dictBuilder/zdict.c
-- contrib/zstd/lib/dictBuilder/zdict.h
 - contrib/zstd/lib/legacy/zstd_legacy.h
 - contrib/zstd/lib/legacy/zstd_v01.c
 - contrib/zstd/lib/legacy/zstd_v01.h
@@ -154,8 +161,12 @@ files:
 - contrib/zstd/lib/legacy/zstd_v06.h
 - contrib/zstd/lib/legacy/zstd_v07.c
 - contrib/zstd/lib/legacy/zstd_v07.h
+- contrib/zstd/lib/libzstd.mk
 - contrib/zstd/lib/libzstd.pc.in
+- contrib/zstd/lib/module.modulemap
+- contrib/zstd/lib/zdict.h
 - contrib/zstd/lib/zstd.h
+- contrib/zstd/lib/zstd_errors.h
 - ext/depend
 - ext/extconf.rb
 - ext/extzstd.c
@@ -166,6 +177,7 @@ files:
 - ext/zstd_common.c
 - ext/zstd_compress.c
 - ext/zstd_decompress.c
+- ext/zstd_decompress_asm.S
 - ext/zstd_dictbuilder.c
 - ext/zstd_dictbuilder_fastcover.c
 - ext/zstd_legacy_v01.c
@@ -202,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: ruby bindings for Zstandard (zstd)