ruby-lzws 1.2.0 → 1.4.1

data/ext/lzws_ext/option.c

@@ -4,51 +4,68 @@
 #include "lzws_ext/option.h"
 
 #include "lzws_ext/error.h"
-#include "ruby.h"
 
 // -- values --
 
-static inline VALUE get_raw_option_value(VALUE options, const char* name)
+static inline VALUE get_raw_value(VALUE options, const char* name)
 {
   return rb_funcall(options, rb_intern("[]"), 1, ID2SYM(rb_intern(name)));
 }
 
-void lzws_ext_get_bool_option(VALUE options, bool* option, const char* name)
+static inline bool get_bool_value(VALUE raw_value)
 {
-  VALUE raw_value = get_raw_option_value(options, name);
-  if (raw_value == Qnil) {
-    return;
-  }
-
   int raw_type = TYPE(raw_value);
   if (raw_type != T_TRUE && raw_type != T_FALSE) {
     lzws_ext_raise_error(LZWS_EXT_ERROR_VALIDATE_FAILED);
   }
 
-  *option = raw_type == T_TRUE;
+  return raw_type == T_TRUE;
 }
 
-void lzws_ext_get_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, const char* name)
+static inline unsigned int get_uint_value(VALUE raw_value)
 {
-  VALUE raw_value = get_raw_option_value(options, name);
-  if (raw_value == Qnil) {
-    return;
-  }
-
   Check_Type(raw_value, T_FIXNUM);
 
-  *option = NUM2UINT(raw_value);
+  return NUM2UINT(raw_value);
 }
 
-size_t lzws_ext_get_size_option_value(VALUE options, const char* name)
+static inline size_t get_size_value(VALUE raw_value)
 {
-  VALUE raw_value = get_raw_option_value(options, name);
-
   Check_Type(raw_value, T_FIXNUM);
 
   return NUM2SIZET(raw_value);
 }
 
+void lzws_ext_resolve_bool_option(VALUE options, bool* option, const char* name)
+{
+  VALUE raw_value = get_raw_value(options, name);
+  if (raw_value != Qnil) {
+    *option = get_bool_value(raw_value);
+  }
+}
+
+void lzws_ext_resolve_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, const char* name)
+{
+  VALUE raw_value = get_raw_value(options, name);
+  if (raw_value != Qnil) {
+    *option = get_uint_value(raw_value);
+  }
+}
+
+bool lzws_ext_get_bool_option_value(VALUE options, const char* name)
+{
+  VALUE raw_value = get_raw_value(options, name);
+
+  return get_bool_value(raw_value);
+}
+
+size_t lzws_ext_get_size_option_value(VALUE options, const char* name)
+{
+  VALUE raw_value = get_raw_value(options, name);
+
+  return get_size_value(raw_value);
+}
+
 // -- exports --
 
 void lzws_ext_option_exports(VALUE root_module)

data/ext/lzws_ext/option.h

@@ -11,36 +11,38 @@
 
 #include "ruby.h"
 
-void lzws_ext_get_bool_option(VALUE options, bool* option, const char* name);
-void lzws_ext_get_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, const char* name);
+void lzws_ext_resolve_bool_option(VALUE options, bool* option, const char* name);
+void lzws_ext_resolve_max_code_bit_length_option(VALUE options, lzws_byte_fast_t* option, const char* name);
 
-#define LZWS_EXT_GET_BOOL_OPTION(options, target_options, name) \
-  lzws_ext_get_bool_option(options, &target_options.name, #name);
+#define LZWS_EXT_RESOLVE_BOOL_OPTION(options, target_options, name) \
+  lzws_ext_resolve_bool_option(options, &target_options.name, #name);
 
-#define LZWS_EXT_GET_MAX_CODE_BIT_LENGTH_OPTION(options, target_options, name) \
-  lzws_ext_get_max_code_bit_length_option(options, &target_options.name, #name);
+#define LZWS_EXT_RESOLVE_MAX_CODE_BIT_LENGTH_OPTION(options, target_options, name) \
+  lzws_ext_resolve_max_code_bit_length_option(options, &target_options.name, #name);
 
-#define LZWS_EXT_GET_COMPRESSOR_OPTIONS(options)                                             \
-  lzws_compressor_options_t compressor_options = LZWS_COMPRESSOR_DEFAULT_OPTIONS;            \
-                                                                                             \
-  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, without_magic_header);               \
-  LZWS_EXT_GET_MAX_CODE_BIT_LENGTH_OPTION(options, compressor_options, max_code_bit_length); \
-  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, block_mode);                         \
-  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, msb);                                \
-  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, unaligned_bit_groups);               \
-  LZWS_EXT_GET_BOOL_OPTION(options, compressor_options, quiet);
+#define LZWS_EXT_GET_COMPRESSOR_OPTIONS(options)                                                 \
+  lzws_compressor_options_t compressor_options = LZWS_COMPRESSOR_DEFAULT_OPTIONS;                \
+                                                                                                 \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, compressor_options, without_magic_header);               \
+  LZWS_EXT_RESOLVE_MAX_CODE_BIT_LENGTH_OPTION(options, compressor_options, max_code_bit_length); \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, compressor_options, block_mode);                         \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, compressor_options, msb);                                \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, compressor_options, unaligned_bit_groups);               \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, compressor_options, quiet);
 
 #define LZWS_EXT_GET_DECOMPRESSOR_OPTIONS(options)                                      \
   lzws_decompressor_options_t decompressor_options = LZWS_DECOMPRESSOR_DEFAULT_OPTIONS; \
                                                                                         \
-  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, without_magic_header);        \
-  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, msb);                         \
-  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, unaligned_bit_groups);        \
-  LZWS_EXT_GET_BOOL_OPTION(options, decompressor_options, quiet);
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, decompressor_options, without_magic_header);    \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, decompressor_options, msb);                     \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, decompressor_options, unaligned_bit_groups);    \
+  LZWS_EXT_RESOLVE_BOOL_OPTION(options, decompressor_options, quiet);
 
+bool   lzws_ext_get_bool_option_value(VALUE options, const char* name);
 size_t lzws_ext_get_size_option_value(VALUE options, const char* name);
 
-#define LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, name) size_t name = lzws_ext_get_size_option_value(options, #name);
+#define LZWS_EXT_GET_BOOL_OPTION(options, name) bool name = lzws_ext_get_bool_option_value(options, #name);
+#define LZWS_EXT_GET_SIZE_OPTION(options, name) size_t name = lzws_ext_get_size_option_value(options, #name);
 
 void lzws_ext_option_exports(VALUE root_module);
 

data/ext/lzws_ext/stream/compressor.c

@@ -5,11 +5,12 @@
 
 #include <lzws/buffer.h>
 #include <lzws/compressor/main.h>
-#include <lzws/compressor/state.h>
 
 #include "lzws_ext/error.h"
+#include "lzws_ext/gvl.h"
 #include "lzws_ext/option.h"
-#include "ruby.h"
+
+// -- initialization --
 
 static void free_compressor(lzws_ext_compressor_t* compressor_ptr)
 {
@@ -36,6 +37,7 @@ VALUE lzws_ext_allocate_compressor(VALUE klass)
   compressor_ptr->destination_buffer_length           = 0;
   compressor_ptr->remaining_destination_buffer        = NULL;
   compressor_ptr->remaining_destination_buffer_length = 0;
+  compressor_ptr->gvl                                 = false;
 
   return self;
 }
@@ -48,8 +50,9 @@ VALUE lzws_ext_initialize_compressor(VALUE self, VALUE options)
 {
   GET_COMPRESSOR(self);
   Check_Type(options, T_HASH);
+  LZWS_EXT_GET_SIZE_OPTION(options, destination_buffer_length);
+  LZWS_EXT_GET_BOOL_OPTION(options, gvl);
   LZWS_EXT_GET_COMPRESSOR_OPTIONS(options);
-  LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, destination_buffer_length);
 
   lzws_compressor_state_t* state_ptr;
 
@@ -80,63 +83,106 @@ VALUE lzws_ext_initialize_compressor(VALUE self, VALUE options)
   compressor_ptr->destination_buffer_length           = destination_buffer_length;
   compressor_ptr->remaining_destination_buffer        = destination_buffer;
   compressor_ptr->remaining_destination_buffer_length = destination_buffer_length;
+  compressor_ptr->gvl                                 = gvl;
 
   return Qnil;
 }
 
+// -- compress --
+
 #define DO_NOT_USE_AFTER_CLOSE(compressor_ptr)                                           \
   if (compressor_ptr->state_ptr == NULL || compressor_ptr->destination_buffer == NULL) { \
     lzws_ext_raise_error(LZWS_EXT_ERROR_USED_AFTER_CLOSE);                               \
   }
 
-#define GET_SOURCE_DATA(source_value)                                   \
-  Check_Type(source_value, T_STRING);                                   \
-                                                                        \
-  const char*      source                  = RSTRING_PTR(source_value); \
-  size_t           source_length           = RSTRING_LEN(source_value); \
-  lzws_ext_byte_t* remaining_source        = (lzws_ext_byte_t*) source; \
-  size_t           remaining_source_length = source_length;
+typedef struct
+{
+  lzws_ext_compressor_t* compressor_ptr;
+  lzws_ext_byte_t*       remaining_source;
+  size_t*                remaining_source_length_ptr;
+  lzws_result_t          result;
+} compress_args_t;
 
-VALUE lzws_ext_compress(VALUE self, VALUE source_value)
+static inline void* compress_wrapper(void* data)
 {
-  GET_COMPRESSOR(self);
-  DO_NOT_USE_AFTER_CLOSE(compressor_ptr);
-  GET_SOURCE_DATA(source_value);
+  compress_args_t*       args           = data;
+  lzws_ext_compressor_t* compressor_ptr = args->compressor_ptr;
 
-  lzws_result_t result = lzws_compress(
+  args->result = lzws_compress(
     compressor_ptr->state_ptr,
-    &remaining_source,
-    &remaining_source_length,
+    &args->remaining_source,
+    args->remaining_source_length_ptr,
     &compressor_ptr->remaining_destination_buffer,
     &compressor_ptr->remaining_destination_buffer_length);
 
-  if (result != 0 && result != LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION) {
+  return NULL;
+}
+
+VALUE lzws_ext_compress(VALUE self, VALUE source_value)
+{
+  GET_COMPRESSOR(self);
+  DO_NOT_USE_AFTER_CLOSE(compressor_ptr);
+  Check_Type(source_value, T_STRING);
+
+  const char*      source                  = RSTRING_PTR(source_value);
+  size_t           source_length           = RSTRING_LEN(source_value);
+  lzws_ext_byte_t* remaining_source        = (lzws_ext_byte_t*) source;
+  size_t           remaining_source_length = source_length;
+
+  compress_args_t args = {
+    .compressor_ptr              = compressor_ptr,
+    .remaining_source            = remaining_source,
+    .remaining_source_length_ptr = &remaining_source_length};
+
+  LZWS_EXT_GVL_WRAP(compressor_ptr->gvl, compress_wrapper, &args);
+  if (args.result != 0 && args.result != LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION) {
     lzws_ext_raise_error(LZWS_EXT_ERROR_UNEXPECTED);
   }
 
   VALUE bytes_written          = SIZET2NUM(source_length - remaining_source_length);
-  VALUE needs_more_destination = result == LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
+  VALUE needs_more_destination = args.result == LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
 
   return rb_ary_new_from_args(2, bytes_written, needs_more_destination);
 }
 
-VALUE lzws_ext_compressor_finish(VALUE self)
+// -- compressor finish --
+
+typedef struct
 {
-  GET_COMPRESSOR(self);
-  DO_NOT_USE_AFTER_CLOSE(compressor_ptr);
+  lzws_ext_compressor_t* compressor_ptr;
+  lzws_result_t          result;
+} compressor_finish_args_t;
 
-  lzws_result_t result = lzws_compressor_finish(
+static inline void* compressor_finish_wrapper(void* data)
+{
+  compressor_finish_args_t* args           = data;
+  lzws_ext_compressor_t*    compressor_ptr = args->compressor_ptr;
+
+  args->result = lzws_compressor_finish(
     compressor_ptr->state_ptr,
     &compressor_ptr->remaining_destination_buffer,
     &compressor_ptr->remaining_destination_buffer_length);
 
-  if (result != 0 && result != LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION) {
+  return NULL;
+}
+
+VALUE lzws_ext_compressor_finish(VALUE self)
+{
+  GET_COMPRESSOR(self);
+  DO_NOT_USE_AFTER_CLOSE(compressor_ptr);
+
+  compressor_finish_args_t args = {.compressor_ptr = compressor_ptr};
+
+  LZWS_EXT_GVL_WRAP(compressor_ptr->gvl, compressor_finish_wrapper, &args);
+  if (args.result != 0 && args.result != LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION) {
     lzws_ext_raise_error(LZWS_EXT_ERROR_UNEXPECTED);
   }
 
-  return result == LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
+  return args.result == LZWS_COMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
 }
 
+// -- other --
+
 VALUE lzws_ext_compressor_read_result(VALUE self)
 {
   GET_COMPRESSOR(self);
@@ -156,6 +202,8 @@ VALUE lzws_ext_compressor_read_result(VALUE self)
   return result_value;
 }
 
+// -- cleanup --
+
 VALUE lzws_ext_compressor_close(VALUE self)
 {
   GET_COMPRESSOR(self);
@@ -175,12 +223,14 @@ VALUE lzws_ext_compressor_close(VALUE self)
     compressor_ptr->destination_buffer = NULL;
   }
 
-  // It is possible to keep "destination_buffer_length", "remaining_destination_buffer"
-  //   and "remaining_destination_buffer_length" as is.
+  // It is possible to keep "destination_buffer_length", "remaining_destination_buffer",
+  //   "remaining_destination_buffer_length" and "gvl" as is.
 
   return Qnil;
 }
 
+// -- exports --
+
 void lzws_ext_compressor_exports(VALUE root_module)
 {
   VALUE module = rb_define_module_under(root_module, "Stream");

data/ext/lzws_ext/stream/compressor.h

@@ -5,6 +5,7 @@
 #define LZWS_EXT_STREAM_COMPRESSOR_H
 
 #include <lzws/compressor/state.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 #include "lzws_ext/common.h"
@@ -17,6 +18,7 @@ typedef struct
   size_t                   destination_buffer_length;
   lzws_ext_byte_t*         remaining_destination_buffer;
   size_t                   remaining_destination_buffer_length;
+  bool                     gvl;
 } lzws_ext_compressor_t;
 
 VALUE lzws_ext_allocate_compressor(VALUE klass);

data/ext/lzws_ext/stream/decompressor.c

@@ -5,11 +5,12 @@
 
 #include <lzws/buffer.h>
 #include <lzws/decompressor/main.h>
-#include <lzws/decompressor/state.h>
 
 #include "lzws_ext/error.h"
+#include "lzws_ext/gvl.h"
 #include "lzws_ext/option.h"
-#include "ruby.h"
+
+// -- initialization --
 
 static void free_decompressor(lzws_ext_decompressor_t* decompressor_ptr)
 {
@@ -48,8 +49,9 @@ VALUE lzws_ext_initialize_decompressor(VALUE self, VALUE options)
 {
   GET_DECOMPRESSOR(self);
   Check_Type(options, T_HASH);
+  LZWS_EXT_GET_SIZE_OPTION(options, destination_buffer_length);
+  LZWS_EXT_GET_BOOL_OPTION(options, gvl);
   LZWS_EXT_GET_DECOMPRESSOR_OPTIONS(options);
-  LZWS_EXT_GET_BUFFER_LENGTH_OPTION(options, destination_buffer_length);
 
   lzws_decompressor_state_t* state_ptr;
 
@@ -78,38 +80,60 @@ VALUE lzws_ext_initialize_decompressor(VALUE self, VALUE options)
   decompressor_ptr->destination_buffer_length           = destination_buffer_length;
   decompressor_ptr->remaining_destination_buffer        = destination_buffer;
   decompressor_ptr->remaining_destination_buffer_length = destination_buffer_length;
+  decompressor_ptr->gvl                                 = gvl;
 
   return Qnil;
 }
 
+// -- decompress --
+
 #define DO_NOT_USE_AFTER_CLOSE(decompressor_ptr)                                             \
   if (decompressor_ptr->state_ptr == NULL || decompressor_ptr->destination_buffer == NULL) { \
     lzws_ext_raise_error(LZWS_EXT_ERROR_USED_AFTER_CLOSE);                                   \
   }
 
-#define GET_SOURCE_DATA(source_value)                                   \
-  Check_Type(source_value, T_STRING);                                   \
-                                                                        \
-  const char*      source                  = RSTRING_PTR(source_value); \
-  size_t           source_length           = RSTRING_LEN(source_value); \
-  lzws_ext_byte_t* remaining_source        = (lzws_ext_byte_t*) source; \
-  size_t           remaining_source_length = source_length;
+typedef struct
+{
+  lzws_ext_decompressor_t* decompressor_ptr;
+  lzws_ext_byte_t*         remaining_source;
+  size_t*                  remaining_source_length_ptr;
+  lzws_result_t            result;
+} decompress_args_t;
 
-VALUE lzws_ext_decompress(VALUE self, VALUE source_value)
+static inline void* decompress_wrapper(void* data)
 {
-  GET_DECOMPRESSOR(self);
-  DO_NOT_USE_AFTER_CLOSE(decompressor_ptr);
-  GET_SOURCE_DATA(source_value);
+  decompress_args_t*       args             = data;
+  lzws_ext_decompressor_t* decompressor_ptr = args->decompressor_ptr;
 
-  lzws_result_t result = lzws_decompress(
+  args->result = lzws_decompress(
     decompressor_ptr->state_ptr,
-    &remaining_source,
-    &remaining_source_length,
+    &args->remaining_source,
+    args->remaining_source_length_ptr,
     &decompressor_ptr->remaining_destination_buffer,
     &decompressor_ptr->remaining_destination_buffer_length);
 
-  if (result != 0 && result != LZWS_DECOMPRESSOR_NEEDS_MORE_DESTINATION) {
-    switch (result) {
+  return NULL;
+}
+
+VALUE lzws_ext_decompress(VALUE self, VALUE source_value)
+{
+  GET_DECOMPRESSOR(self);
+  DO_NOT_USE_AFTER_CLOSE(decompressor_ptr);
+  Check_Type(source_value, T_STRING);
+
+  const char*      source                  = RSTRING_PTR(source_value);
+  size_t           source_length           = RSTRING_LEN(source_value);
+  lzws_ext_byte_t* remaining_source        = (lzws_ext_byte_t*) source;
+  size_t           remaining_source_length = source_length;
+
+  decompress_args_t args = {
+    .decompressor_ptr            = decompressor_ptr,
+    .remaining_source            = remaining_source,
+    .remaining_source_length_ptr = &remaining_source_length};
+
+  LZWS_EXT_GVL_WRAP(decompressor_ptr->gvl, decompress_wrapper, &args);
+  if (args.result != 0 && args.result != LZWS_DECOMPRESSOR_NEEDS_MORE_DESTINATION) {
+    switch (args.result) {
       case LZWS_DECOMPRESSOR_INVALID_MAGIC_HEADER:
       case LZWS_DECOMPRESSOR_INVALID_MAX_CODE_BIT_LENGTH:
         lzws_ext_raise_error(LZWS_EXT_ERROR_VALIDATE_FAILED);
@@ -121,11 +145,13 @@ VALUE lzws_ext_decompress(VALUE self, VALUE source_value)
   }
 
   VALUE bytes_read             = SIZET2NUM(source_length - remaining_source_length);
-  VALUE needs_more_destination = result == LZWS_DECOMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
+  VALUE needs_more_destination = args.result == LZWS_DECOMPRESSOR_NEEDS_MORE_DESTINATION ? Qtrue : Qfalse;
 
   return rb_ary_new_from_args(2, bytes_read, needs_more_destination);
 }
 
+// -- other --
+
 VALUE lzws_ext_decompressor_read_result(VALUE self)
 {
   GET_DECOMPRESSOR(self);
@@ -145,6 +171,8 @@ VALUE lzws_ext_decompressor_read_result(VALUE self)
   return result_value;
 }
 
+// -- cleanup --
+
 VALUE lzws_ext_decompressor_close(VALUE self)
 {
   GET_DECOMPRESSOR(self);
@@ -170,6 +198,8 @@ VALUE lzws_ext_decompressor_close(VALUE self)
   return Qnil;
 }
 
+// -- exports --
+
 void lzws_ext_decompressor_exports(VALUE root_module)
 {
   VALUE module = rb_define_module_under(root_module, "Stream");

data/ext/lzws_ext/stream/decompressor.h

@@ -5,6 +5,7 @@
 #define LZWS_EXT_STREAM_DECOMPRESSOR_H
 
 #include <lzws/decompressor/state.h>
+#include <stdbool.h>
 #include <stdlib.h>
 
 #include "lzws_ext/common.h"
@@ -17,6 +18,7 @@ typedef struct
   size_t                     destination_buffer_length;
   lzws_ext_byte_t*           remaining_destination_buffer;
   size_t                     remaining_destination_buffer_length;
+  bool                       gvl;
 } lzws_ext_decompressor_t;
 
 VALUE lzws_ext_allocate_decompressor(VALUE klass);