feat: unlock GVL for decompress

SpringMT · Apr 13, 2024 · e754f09 · e754f09
1 parent 3be703a
commit e754f09
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/ext/zstdruby/common.h b/ext/zstdruby/common.h
@@ -15,32 +15,6 @@ static int convert_compression_level(VALUE compression_level_value)
   return NUM2INT(compression_level_value);
 }
 
-struct compress_params {
-  ZSTD_CCtx* ctx;
-  ZSTD_outBuffer* output;
-  ZSTD_inBuffer* input;
-  ZSTD_EndDirective endOp;
-  size_t ret;
-};
-
-static void* compress_wrapper(void* args)
-{
-    struct compress_params* params = args;
-    params->ret = ZSTD_compressStream2(params->ctx, params->output, params->input, params->endOp);
-    return NULL;
-}
-
-static size_t zstd_compress(ZSTD_CCtx* const ctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input, ZSTD_EndDirective endOp)
-{
-#ifdef HAVE_RUBY_THREAD_H
-    struct compress_params params = { ctx, output, input, endOp };
-    rb_thread_call_without_gvl(compress_wrapper, &params, NULL, NULL);
-    return params.ret;
-#else
-    return ZSTD_compressStream2(ctx, output, input, endOp);
-#endif
-}
-
 static void set_compress_params(ZSTD_CCtx* const ctx, VALUE level_from_args, VALUE kwargs)
 {
   ID kwargs_keys[2];
@@ -69,28 +43,29 @@ static void set_compress_params(ZSTD_CCtx* const ctx, VALUE level_from_args, VAL
   }
 }
 
-struct decompress_params {
-  ZSTD_DCtx* dctx;
+struct compress_params {
+  ZSTD_CCtx* ctx;
   ZSTD_outBuffer* output;
   ZSTD_inBuffer* input;
+  ZSTD_EndDirective endOp;
   size_t ret;
 };
 
-static void* decompress_wrapper(void* args)
+static void* compress_wrapper(void* args)
 {
-    struct decompress_params* params = args;
-    params->ret = ZSTD_decompressStream(params->dctx, params->output, params->input);
+    struct compress_params* params = args;
+    params->ret = ZSTD_compressStream2(params->ctx, params->output, params->input, params->endOp);
     return NULL;
 }
 
-static size_t zstd_decompress(ZSTD_DCtx* const dctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
+static size_t zstd_compress(ZSTD_CCtx* const ctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input, ZSTD_EndDirective endOp)
 {
 #ifdef HAVE_RUBY_THREAD_H
-    struct decompress_params params = { dctx, output, input };
-    rb_thread_call_without_gvl(decompress_wrapper, &params, NULL, NULL);
+    struct compress_params params = { ctx, output, input, endOp };
+    rb_thread_call_without_gvl(compress_wrapper, &params, NULL, NULL);
     return params.ret;
 #else
-    return ZSTD_decompressStream(dctx, output, input);
+    return ZSTD_compressStream2(ctx, output, input, endOp);
 #endif
 }
 
@@ -112,4 +87,29 @@ static void set_decompress_params(ZSTD_DCtx* const dctx, VALUE kwargs)
   }
 }
 
+struct decompress_params {
+  ZSTD_DCtx* dctx;
+  ZSTD_outBuffer* output;
+  ZSTD_inBuffer* input;
+  size_t ret;
+};
+
+static void* decompress_wrapper(void* args)
+{
+    struct decompress_params* params = args;
+    params->ret = ZSTD_decompressStream(params->dctx, params->output, params->input);
+    return NULL;
+}
+
+static size_t zstd_decompress(ZSTD_DCtx* const dctx, ZSTD_outBuffer* output, ZSTD_inBuffer* input)
+{
+#ifdef HAVE_RUBY_THREAD_H
+    struct decompress_params params = { dctx, output, input };
+    rb_thread_call_without_gvl(decompress_wrapper, &params, NULL, NULL);
+    return params.ret;
+#else
+    return ZSTD_decompressStream(dctx, output, input);
+#endif
+}
+
 #endif /* ZSTD_RUBY_H */
diff --git a/ext/zstdruby/zstdruby.c b/ext/zstdruby/zstdruby.c
@@ -99,7 +99,7 @@ static VALUE decompress_buffered(ZSTD_DCtx* dctx, const char* input_data, size_t
     rb_str_resize(output_string, output.size);
     output.dst = RSTRING_PTR(output_string);
 
-    size_t ret = ZSTD_decompressStream(dctx, &output, &input);
+    size_t ret = zstd_decompress(dctx, &output, &input);
     if (ZSTD_isError(ret)) {
       ZSTD_freeDCtx(dctx);
       rb_raise(rb_eRuntimeError, "%s: %s", "ZSTD_decompressStream failed", ZSTD_getErrorName(ret));