yaz0 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672cee69a6f75dd7377cf5eb17baeb36275224f98021be0a26f575488b29ea35
-  data.tar.gz: 7ac698b98f48d2816a2b0852e1b8937a9f6d77613b94e7e8cc81f8e7ff03df08
+  metadata.gz: 42f0c89e2edf019afff5f5e96f7cbf1797036ab93ed0725cf58efcdf23607e8f
+  data.tar.gz: 03440e46538b5197eea2d7d490ace2137d83879948ab23e066c779ceffad070b
 SHA512:
-  metadata.gz: 488b8a8e52fc4e9d74caf1db27383cd6be5a5307c8a703b74cc3ec4c175c71bf883c1c4fc82146646ed79a53728c4d6508638914840b5ca16633a0bcbf61f97c
-  data.tar.gz: a06e7544dbad27a7d1647ba621d2abadea7e17cb4fed47a1fbf78e91e4fff81af56955f7423b028265bcd2b51cfadc724ff9dd79b48d72cf7dffc4103f2c0863
+  metadata.gz: 20d3ce38706053cce8975aa079e02b267418f80c4eca0f054b0a09d6116c9a74ce8badbfb4fd12f7c7e88ef074b16d00bef251275961ce38cec6510997e4c3f8
+  data.tar.gz: f5ae97c8115585c113fc5cd139c393c253cb1efc217815e108afdd4f720db315b2e19dc688696f63f3385a0771583a5a2dfc64192ffb71eabfecfe7ecf026a13

data/Gemfile

@@ -3,6 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in yaz0.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rake-compiler"
 gem "rspec", "~> 3.0"

data/ext/yaz0/ext_yaz0.c

@@ -0,0 +1,165 @@
+#include "ext_yaz0.h"
+#include <stdio.h>
+#include <stdint.h>
+
+#define BUFSIZE 0x4000
+
+static void ext_yaz0_stream_free(void*);
+
+static VALUE class_yaz0_stream;
+static VALUE class_yaz0_error;
+static VALUE class_yaz0_error_bad_magic;
+static VALUE class_yaz0_error_end_of_file;
+
+static struct rb_data_type_struct type_yaz0_stream = {
+    "yaz0_stream",
+    { NULL, ext_yaz0_stream_free, NULL },
+    NULL,
+    NULL,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static void
+ext_yaz0_stream_free(void* s)
+{
+    yaz0Destroy((Yaz0Stream*)s);
+}
+
+static VALUE
+ext_yaz0_stream_alloc(VALUE klass)
+{
+    Yaz0Stream* s;
+    int ret;
+
+    ret = yaz0Init(&s);
+    if (ret == YAZ0_OUT_OF_MEMORY)
+        rb_raise(rb_eNoMemError, "Out of memory");
+    return TypedData_Wrap_Struct(klass, &type_yaz0_stream, s);
+}
+
+static void*
+run_NoGVL(void* arg)
+{
+    return (void*)(intptr_t)yaz0Run((Yaz0Stream*)arg);
+}
+
+static VALUE
+run(VALUE self, VALUE io_in, VALUE io_out, int compress, int size, int level)
+{
+    Yaz0Stream* s;
+    VALUE buffer_in;
+    VALUE buffer_out;
+    VALUE tmp;
+    int in_is_str;
+    int ret;
+
+    in_is_str = TYPE(io_in) == T_STRING;
+
+    TypedData_Get_Struct(self, Yaz0Stream, &type_yaz0_stream, s);
+    if (compress)
+        yaz0ModeCompress(s, size, level);
+    else
+        yaz0ModeDecompress(s);
+
+    /* Init the buffers */
+    if (!in_is_str)
+    {
+        buffer_in = rb_str_new(NULL, 0);
+        rb_str_resize(buffer_in, BUFSIZE);
+        rb_gc_register_address(&buffer_in);
+        rb_funcall(io_in, rb_intern("read"), 2, INT2FIX(BUFSIZE), buffer_in);
+    }
+    else
+    {
+        buffer_in = rb_obj_dup(io_in);
+        rb_gc_register_address(&buffer_in);
+    }
+    yaz0Input(s, RSTRING_PTR(buffer_in), (uint32_t)RSTRING_LEN(buffer_in));
+
+    buffer_out = rb_str_new(NULL, 0);
+    rb_str_resize(buffer_out, BUFSIZE);
+    rb_gc_register_address(&buffer_out);
+    yaz0Output(s, RSTRING_PTR(buffer_out), BUFSIZE);
+
+    for (;;)
+    {
+        ret = (int)(intptr_t)rb_thread_call_without_gvl(run_NoGVL, s, RUBY_UBF_IO, NULL);
+        switch (ret)
+        {
+        case YAZ0_NEED_AVAIL_IN:
+            /* Need more input */
+            if (in_is_str)
+            {
+                rb_gc_unregister_address(&buffer_in);
+                rb_gc_unregister_address(&buffer_out);
+                rb_raise(class_yaz0_error_end_of_file, "Unexpected end of file");
+            }
+
+            tmp = rb_funcall(io_in, rb_intern("read"), 2, INT2FIX(BUFSIZE), buffer_in);
+            if (tmp == Qnil)
+            {
+                rb_gc_unregister_address(&buffer_in);
+                rb_gc_unregister_address(&buffer_out);
+                rb_raise(class_yaz0_error_end_of_file, "Unexpected end of file");
+            }
+            yaz0Input(s, RSTRING_PTR(buffer_in), (uint32_t)RSTRING_LEN(buffer_in));
+            break;
+        case YAZ0_NEED_AVAIL_OUT:
+            /* Need more output */
+            rb_str_resize(buffer_out, yaz0OutputChunkSize(s));
+            rb_funcall(io_out, rb_intern("write"), 1, buffer_out);
+            rb_str_resize(buffer_out, BUFSIZE);
+            yaz0Output(s, RSTRING_PTR(buffer_out), BUFSIZE);
+            break;
+        case YAZ0_BAD_MAGIC:
+            rb_gc_unregister_address(&buffer_in);
+            rb_gc_unregister_address(&buffer_out);
+            rb_raise(class_yaz0_error_bad_magic, "Bad magic");
+            break;
+        case YAZ0_OK:
+            goto end;
+        }
+    }
+
+end:
+    /* There might still be unflushed output */
+    rb_str_resize(buffer_out, yaz0OutputChunkSize(s));
+    rb_funcall(io_out, rb_intern("write"), 1, buffer_out);
+
+    rb_gc_unregister_address(&buffer_in);
+    rb_gc_unregister_address(&buffer_out);
+
+    return Qnil;
+}
+
+static VALUE
+ext_yaz0_stream_raw_decompress(VALUE self, VALUE io_in, VALUE io_out)
+{
+    return run(self, io_in, io_out, 0, 0, 0);
+}
+
+static VALUE
+ext_yaz0_stream_raw_compress(VALUE self, VALUE io_in, VALUE io_out, VALUE size, VALUE level)
+{
+    Check_Type(size, T_FIXNUM);
+    Check_Type(level, T_FIXNUM);
+    return run(self, io_in, io_out, 1, FIX2INT(size), FIX2INT(level));
+}
+
+void
+Init_yaz0(void)
+{
+    VALUE mod;
+    mod = rb_define_module("Yaz0");
+
+    /* Error classes */
+    class_yaz0_error = rb_define_class_under(mod, "Error", rb_eStandardError);
+    class_yaz0_error_bad_magic = rb_define_class_under(mod, "BadMagicError", class_yaz0_error);
+    class_yaz0_error_end_of_file = rb_define_class_under(mod, "EndOfFileError", class_yaz0_error);
+
+    /* Stream */
+    class_yaz0_stream = rb_define_class_under(mod, "Stream", rb_cObject);
+    rb_define_alloc_func(class_yaz0_stream, ext_yaz0_stream_alloc);
+    rb_define_method(class_yaz0_stream, "raw_decompress", ext_yaz0_stream_raw_decompress, 2);
+    rb_define_method(class_yaz0_stream, "raw_compress", ext_yaz0_stream_raw_compress, 4);
+}

data/ext/yaz0/ext_yaz0.h

@@ -0,0 +1,8 @@
+#ifndef EXT_YAZ0_H
+#define EXT_YAZ0_H 1
+
+#include <ruby.h>
+#include <ruby/thread.h>
+#include <yaz0.h>
+
+#endif /* YAZ0_H */

data/ext/yaz0/extconf.rb

@@ -1,3 +1,13 @@
 require "mkmf"
 
-create_makefile("yaz0/yaz0")
+extension_name = 'yaz0/yaz0'
+dir_config(extension_name)
+
+libyaz0_src = Dir[File.join(__dir__, "../../libyaz0/src/libyaz0/**/*.c")].map{|x| File.expand_path(x)}
+
+$srcs = libyaz0_src + ["ext_yaz0.c"]
+
+$VPATH << File.expand_path(File.join(__dir__, "../../libyaz0/src/libyaz0"))
+$INCFLAGS << " -I#{File.expand_path(File.join(__dir__, "../../libyaz0/include"))}"
+
+create_makefile(extension_name)

data/lib/yaz0/version.rb

@@ -1,3 +1,3 @@
 module Yaz0
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

data/lib/yaz0.rb

@@ -1,5 +1,47 @@
+require "stringio"
 require "yaz0/version"
 require "yaz0/yaz0"
 
 module Yaz0
+  class Stream
+    def decompress(src, dst = nil)
+      if dst
+        raw_decompress(src, dst)
+        nil
+      else
+        dst = StringIO.new
+        raw_decompress(src, dst)
+        dst.string
+      end
+    end
+
+    def compress(src, dst_or_opts = nil, opts = {})
+      if dst_or_opts.is_a?(Hash)
+        opts = dst_or_opts
+        dst = nil
+      else
+        dst = dst_or_opts
+      end
+
+      level = opts[:level] || 6
+      size = opts[:size] || src.size
+
+      if dst
+        raw_compress(src, dst, size, level)
+        nil
+      else
+        dst = StringIO.new
+        raw_compress(src, dst, size, level)
+        dst.string
+      end
+    end
+  end
+
+  def self.decompress(*args)
+    Yaz0::Stream.new.decompress(*args)
+  end
+
+  def self.compress(*args)
+    Yaz0::Stream.new.compress(*args)
+  end
 end

data/libyaz0/include/yaz0.h

@@ -0,0 +1,34 @@
+#ifndef YAZ0_H
+#define YAZ0_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#if defined(__cplusplus)
+# define YAZ0_API extern "C"
+#else
+# define YAZ0_API
+#endif
+
+#define YAZ0_OK             0
+#define YAZ0_NEED_AVAIL_IN  1
+#define YAZ0_NEED_AVAIL_OUT 2
+#define YAZ0_BAD_MAGIC      (-1)
+#define YAZ0_OUT_OF_MEMORY  (-2)
+
+#define YAZ0_DEFAULT_LEVEL  6
+
+typedef struct Yaz0Stream Yaz0Stream;
+
+YAZ0_API int yaz0Init(Yaz0Stream** stream);
+YAZ0_API int yaz0Destroy(Yaz0Stream* stream);
+YAZ0_API int yaz0ModeDecompress(Yaz0Stream* stream);
+YAZ0_API int yaz0ModeCompress(Yaz0Stream* stream, uint32_t size, int level);
+YAZ0_API int yaz0Run(Yaz0Stream* stream);
+YAZ0_API int yaz0Input(Yaz0Stream* stream, const void* data, uint32_t size);
+YAZ0_API int yaz0Output(Yaz0Stream* stream, void* data, uint32_t size);
+
+YAZ0_API uint32_t yaz0OutputChunkSize(const Yaz0Stream* stream);
+YAZ0_API uint32_t yaz0DecompressedSize(const Yaz0Stream* stream);
+
+#endif /* YAZ0_H */

data/libyaz0/src/libyaz0/CMakeLists.txt

@@ -0,0 +1,3 @@
+file(GLOB SOURCES "*.c")
+add_library(libyaz0 STATIC ${SOURCES})
+set_target_properties(libyaz0 PROPERTIES OUTPUT_NAME "yaz0")