rmagick 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc51525cc3880511b635e26bf96e54159785ecabc95af81dda6f374f073074f5
-  data.tar.gz: 0f51ed92105011c4d7854946f2cf81c86a6fc5c0fcb48b0bd620e0e6b1f92d01
+  metadata.gz: b776ce3e793e02f14844cce0300aaef504783bdb1c190247cdc00b20e1fbc041
+  data.tar.gz: 312ff6d1311a59ac2f90b3cf44742698fcacadc39c2d39ec4c5bfedc7ece3103
 SHA512:
-  metadata.gz: 9aaca50c60d675aae5e868bf882ad14a544d92586ec02844b4be1a754acac6bac81f4729cf64c14cfe9cb1cfcf0d57b7eaecf179b8ab4097dee94ce44def05c8
-  data.tar.gz: 7279013b8d46a66dae34870f7f2918043a8e0305c0e7b79623b8dd66e3409a7707baf3dfd551c17927fce8718de57be2d170cfb0b7a2d156ee5420e9bcd9a814
+  metadata.gz: 6f826ecaf2f6cc471285dab84981d8513c79a18381d08c5e8e0f09a023da3eedce5cf223f495c3aa73efbc82828fd2b915c5b401548e041d8440b204288045d1
+  data.tar.gz: 5758a2256f5cad91968046be67d220dce46de3d9644f925275e2b33fcb37b486a44d5ec06bef0e2644d0108798398798b05cb605b7514af004536cd02edba635

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 5.1.0
+
+Improvements
+- Improve multi-thread performance by releasing GVL (#1352)
+- Add Ractor support (#1349)
+- Avoid overriding compilation variables (#1365)
+- Remove pkg-config command dependency (#1366)
+
 ## RMagick 5.0.0
 
 Improvements

data/README.md

@@ -71,33 +71,33 @@ sudo yum install gcc ImageMagick-devel make which
 On Arch Linux, you can run:
 
 ```sh
-pacman -Syy pkg-config imagemagick
+pacman -Syy imagemagick
 ```
 
 #### Alpine Linux
 On Alpine Linux, you can run:
 
 ```
-apk add pkgconfig imagemagick imagemagick-dev imagemagick-libs
+apk add imagemagick imagemagick-dev imagemagick-libs
 ```
 
 or you can run if you would like to use ImageMagick 6:
 
 ```
-apk add pkgconfig imagemagick6 imagemagick6-dev imagemagick6-libs
+apk add imagemagick6 imagemagick6-dev imagemagick6-libs
 ```
 
 ### macOS
 On macOS, you can run:
 
 ```sh
-brew install pkg-config imagemagick
+brew install imagemagick
 ```
 
 or you can run if you would like to use ImageMagick 6:
 
 ```sh
-brew install pkg-config imagemagick@6
+brew install imagemagick@6
 ```
 
 ### Windows
@@ -164,15 +164,6 @@ subdirectory of the installation directory for any error messages. These
 messages typically contain enough additional information for you to be able to
 diagnose the problem. Also see [this FAQ][libmagick-faq].
 
-On OS X with Homebrew, try (re)installing pkg-config:
-
-```sh
-brew uninstall pkg-config
-brew install pkg-config
-brew unlink pkg-config
-brew link pkg-config
-```
-
 ### Cannot open shared object file
 
 If you get a message like this:

data/before_install_osx.sh

@@ -16,7 +16,8 @@ if [ ! -v IMAGEMAGICK_VERSION ]; then
 fi
 
 export HOMEBREW_NO_AUTO_UPDATE=true
-brew install wget pkg-config ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool zlib webp
+brew uninstall --force imagemagick imagemagick@6
+brew install wget ghostscript freetype jpeg little-cms2 libomp libpng libtiff liblqr libtool zlib webp
 
 export LDFLAGS="-L/usr/local/opt/libxml2/lib -L/usr/local/opt/zlib/lib"
 export CPPFLAGS="-I/usr/local/opt/libxml2/include -I/usr/local/opt/zlib/include"

data/ext/RMagick/extconf.rb

@@ -2,6 +2,7 @@ lib_dir = File.expand_path('../../lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 require 'rubygems'
 require 'mkmf'
+require 'pkg-config'
 
 module RMagick
   class Extconf
@@ -94,18 +95,20 @@ module RMagick
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
 
-        libdir  = `pkg-config --libs-only-L #{$magick_package}`.chomp.sub('-L', '')
-        ldflags = "#{ENV['LDFLAGS']} " + `pkg-config --libs #{$magick_package}`.chomp
+        original_ldflags = $LDFLAGS.dup
+
+        libdir  = PKGConfig.libs_only_L($magick_package).chomp.sub('-L', '')
+        ldflags = "#{ENV['LDFLAGS']} " + PKGConfig.libs($magick_package).chomp
         rpath   = libdir.empty? ? '' : "-Wl,-rpath,#{libdir}"
 
         # Save flags
-        $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
-        $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
-        $LDFLAGS    = "#{ldflags} #{rpath}"
+        $CPPFLAGS   += " #{ENV['CPPFLAGS']} " + PKGConfig.cflags($magick_package).chomp
+        $LOCAL_LIBS += " #{ENV['LIBS']} "     + PKGConfig.libs($magick_package).chomp
+        $LDFLAGS    += " #{ldflags} #{rpath}"
 
         unless try_link("int main() { }")
           # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
-          $LDFLAGS = ldflags
+          $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
 
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
@@ -113,8 +116,8 @@ module RMagick
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
 
         dir_paths = search_paths_for_library_for_windows
-        $CPPFLAGS = %(-I"#{dir_paths[:include]}")
-        $LDFLAGS = %(-L"#{dir_paths[:lib]}")
+        $CPPFLAGS += %( -I"#{dir_paths[:include]}")
+        $LDFLAGS += %( -L"#{dir_paths[:lib]}")
         $LDFLAGS << ' -lucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
         have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
@@ -126,11 +129,15 @@ module RMagick
         $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
         $LDFLAGS << ' -libpath:ucrt' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
 
-        $LOCAL_LIBS = im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib'
+        $LOCAL_LIBS += ' ' + (im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
 
       end
 
-      $CPPFLAGS << (have_macro('__GNUC__') ? ' -std=gnu99' : ' -std=c99')
+      $CPPFLAGS << if have_macro('__GNUC__')
+                     ' -std=gnu99 -Wno-void-pointer-to-int-cast -Wno-void-pointer-to-enum-cast -Wno-pointer-to-int-cast'
+                   else
+                     ' -std=c99'
+                   end
     end
 
     def exit_failure(msg)
@@ -152,7 +159,7 @@ module RMagick
 
     def detect_imagemagick_packages(packages)
       packages.select do |package|
-        system "pkg-config --exists #{package}"
+        PKGConfig.exist?(package)
       end
     end
 
@@ -255,7 +262,7 @@ module RMagick
     # issue #169
     # set ARCHFLAGS appropriately for OSX
     def configure_archflags_for_osx(magick_package)
-      return unless `pkg-config #{magick_package} --libs-only-L`.match(%r{-L(.+)/lib})
+      return unless PKGConfig.libs_only_L(magick_package).match(%r{-L(.+)/lib})
 
       imagemagick_dir = Regexp.last_match(1)
       command = Dir.glob(File.join(imagemagick_dir, "bin/*")).select { |file| File.executable? file }.first
@@ -330,16 +337,12 @@ module RMagick
       END_FAILURE
 
       if RUBY_PLATFORM !~ /mswin|mingw/
-        unless find_executable('pkg-config')
-          exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
-        end
-
-        unless `pkg-config --libs MagickCore`[/\bl\s*(MagickCore|Magick)6?\b/]
+        unless PKGConfig.libs('MagickCore')[/\bl\s*(MagickCore|Magick)6?\b/]
           exit_failure failure_message
         end
 
         $magick_package = determine_imagemagick_package
-        $magick_version = `pkg-config #{$magick_package} --modversion`[/^(\d+\.\d+\.\d+)/]
+        $magick_version = PKGConfig.modversion($magick_package)[/^(\d+\.\d+\.\d+)/]
       else
         `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         $magick_version = Regexp.last_match(1)
@@ -396,9 +399,6 @@ module RMagick
 
     def create_makefile_file
       create_header_file
-      # Prior to 1.8.5 mkmf duplicated the symbols on the command line and in the
-      # extconf.h header. Suppress that behavior by removing the symbol array.
-      $defs = []
 
       # Force re-compilation if the generated Makefile changed.
       $config_h = 'Makefile'

data/ext/RMagick/rmagick.h

@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include "ruby.h"
 #include "ruby/io.h"
+#include "rmagick_gvl.h"
 
 #if defined(__MINGW32__)
     // Ruby defines wrong format specifiers for MinGW. So this defines original macro in here.
@@ -61,6 +62,11 @@
 #undef PACKAGE_TARNAME
 #undef WORDS_BIGENDIAN
 
+#ifndef HAVE_RB_EXT_RACTOR_SAFE
+#undef RUBY_TYPED_FROZEN_SHAREABLE
+#define RUBY_TYPED_FROZEN_SHAREABLE 0
+#endif
+
 #include "extconf.h"
 
 #if defined(IMAGEMAGICK_7)
@@ -410,6 +416,14 @@ EXTERN ID rm_ID_push;              /**< "push" */
 EXTERN ID rm_ID_values;            /**< "values" */
 EXTERN ID rm_ID_width;             /**< "width" */
 
+extern const rb_data_type_t rm_enum_data_type;
+extern const rb_data_type_t rm_info_data_type;
+extern const rb_data_type_t rm_image_data_type;
+extern const rb_data_type_t rm_draw_data_type;
+extern const rb_data_type_t rm_pixel_data_type;
+extern const rb_data_type_t rm_montage_data_type;
+extern const rb_data_type_t rm_kernel_info_data_type;
+
 #if !defined(min)
 #define min(a, b) ((a)<(b)?(a):(b)) /**< min of two values */
 #endif
@@ -440,47 +454,47 @@ EXTERN ID rm_ID_width;             /**< "width" */
 #define R_dbl_to_C_dbl(attr) NUM2DBL(attr) /**< C double <- Ruby double */
 
 //! define attribute reader
-#define IMPLEMENT_ATTR_READER(class, attr, type) \
+#define IMPLEMENT_TYPED_ATTR_READER(class, attr, type, data_type) \
     {\
         class *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, class, data_type, ptr);\
         return C_##type##_to_R_##type(ptr->attr);\
     }
 
 //! define attribute reader when attribute name is different from the field name
-#define IMPLEMENT_ATTR_READERF(class, attr, field, type) \
+#define IMPLEMENT_TYPED_ATTR_READERF(class, attr, field, type, data_type) \
     {\
         class *ptr;\
         rm_check_destroyed(self); \
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, class, data_type, ptr);\
         return C_##type##_to_R_##type(ptr->field);\
     }
 
 //! define attribute writer
-#define IMPLEMENT_ATTR_WRITER(class, attr, type) \
+#define IMPLEMENT_TYPED_ATTR_WRITER(class, attr, type, data_type) \
     {\
         class *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
         rb_check_frozen(self);\
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, class, data_type, ptr);\
         ptr->attr = R_##type##_to_C_##type(val);\
         return val;\
     }
 
 //! define attribute writer when attribute name is different from the field name
-#define IMPLEMENT_ATTR_WRITERF(class, attr, field, type) \
+#define IMPLEMENT_TYPED_ATTR_WRITERF(class, attr, field, type, data_type) \
     {\
         class *ptr;\
         if (rb_obj_is_kind_of(self, Class_Image) == Qtrue) {\
             rm_check_destroyed(self); \
         }\
         rb_check_frozen(self);\
-        Data_Get_Struct(self, class, ptr);\
+        TypedData_Get_Struct(self, class, data_type, ptr);\
         ptr->field = R_##type##_to_C_##type(val);\
         return self;\
     }
@@ -510,7 +524,6 @@ EXTERN ID rm_ID_width;             /**< "width" */
 #define DEF_CONSTV(constant, val) rb_define_const(Module_Magick, #constant, UINT2NUM(val))
 #endif
 
-
 //! Convert a Ruby enum constant back to a C enum member.
 #define VALUE_TO_ENUM(value, e, type) \
    do {\
@@ -518,7 +531,7 @@ EXTERN ID rm_ID_width;             /**< "width" */
    if (CLASS_OF(value) != Class_##type)\
        rb_raise(rb_eTypeError, "wrong enumeration type - expected %s, got %s", \
                 rb_class2name(Class_##type), rb_class2name(CLASS_OF(value)));\
-   Data_Get_Struct(value, MagickEnum, magick_enum);\
+   TypedData_Get_Struct(value, MagickEnum, &rm_enum_data_type, magick_enum);\
    e = (type)(magick_enum->val);\
    } while(0)
 
@@ -1039,7 +1052,6 @@ ATTR_ACCESSOR(Pixel, cyan)
 ATTR_ACCESSOR(Pixel, magenta)
 ATTR_ACCESSOR(Pixel, yellow)
 ATTR_ACCESSOR(Pixel, black)
-extern void   destroy_Pixel(Pixel *);
 extern VALUE  Pixel_alloc(VALUE);
 extern VALUE  Pixel_case_eq(VALUE, VALUE);
 extern VALUE  Pixel_clone(VALUE);

data/ext/RMagick/rmagick_gvl.h

@@ -0,0 +1,224 @@
+#ifndef _RMAGICK_GVL_H_
+#define _RMAGICK_GVL_H_
+
+#include "ruby/thread.h"
+
+typedef void *(gvl_function_t)(void *);
+
+#define GVL_FUNC(name)        name##_gvl
+#define GVL_STRUCT_TYPE(name) name##_args_t
+#define CALL_FUNC_WITHOUT_GVL(fp, args) \
+    rb_thread_call_without_gvl(fp, args, RUBY_UBF_PROCESS, NULL)
+
+
+#define DEFINE_GVL_STRUCT1(name, type1) \
+    typedef struct { \
+        type1 arg1; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC1(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1); \
+    }
+
+#define DEFINE_GVL_STUB1(name, type1) \
+    DEFINE_GVL_STRUCT1(name, type1); \
+    DEFINE_GVL_FUNC1(name, name)
+
+
+#define DEFINE_GVL_STRUCT2(name, type1, type2) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC2(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2); \
+    }
+
+#define DEFINE_GVL_STUB2(name, type1, type2) \
+    DEFINE_GVL_STRUCT2(name, type1, type2); \
+    DEFINE_GVL_FUNC2(name, name)
+
+
+#define DEFINE_GVL_STRUCT3(name, type1, type2, type3) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC3(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3); \
+    }
+
+#define DEFINE_GVL_STUB3(name, type1, type2, type3) \
+    DEFINE_GVL_STRUCT3(name, type1, type2, type3); \
+    DEFINE_GVL_FUNC3(name, name)
+
+
+#define DEFINE_GVL_STRUCT4(name, type1, type2, type3, type4) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC4(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4); \
+    }
+
+#define DEFINE_GVL_STUB4(name, type1, type2, type3, type4) \
+    DEFINE_GVL_STRUCT4(name, type1, type2, type3, type4); \
+    DEFINE_GVL_FUNC4(name, name)
+
+
+#define DEFINE_GVL_STRUCT5(name, type1, type2, type3, type4, type5) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+        type5 arg5; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC5(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5); \
+    }
+#define DEFINE_GVL_STUB5(name, type1, type2, type3, type4, type5) \
+    DEFINE_GVL_STRUCT5(name, type1, type2, type3, type4, type5); \
+    DEFINE_GVL_FUNC5(name, name)
+
+
+#define DEFINE_GVL_STRUCT6(name, type1, type2, type3, type4, type5, type6) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+        type5 arg5; \
+        type6 arg6; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC6(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5, args->arg6); \
+    }
+#define DEFINE_GVL_STUB6(name, type1, type2, type3, type4, type5, type6) \
+    DEFINE_GVL_STRUCT6(name, type1, type2, type3, type4, type5, type6); \
+    DEFINE_GVL_FUNC6(name, name)
+
+
+#define DEFINE_GVL_STRUCT7(name, type1, type2, type3, type4, type5, type6, type7) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+        type5 arg5; \
+        type6 arg6; \
+        type7 arg7; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC7(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5, args->arg6, args->arg7); \
+    }
+#define DEFINE_GVL_STUB7(name, type1, type2, type3, type4, type5, type6, type7) \
+    DEFINE_GVL_STRUCT7(name, type1, type2, type3, type4, type5, type6, type7); \
+    DEFINE_GVL_FUNC7(name, name)
+
+
+#define DEFINE_GVL_STRUCT8(name, type1, type2, type3, type4, type5, type6, type7, type8) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+        type5 arg5; \
+        type6 arg6; \
+        type7 arg7; \
+        type8 arg8; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC8(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5, args->arg6, args->arg7, args->arg8); \
+    }
+#define DEFINE_GVL_STUB8(name, type1, type2, type3, type4, type5, type6, type7, type8) \
+    DEFINE_GVL_STRUCT8(name, type1, type2, type3, type4, type5, type6, type7, type8); \
+    DEFINE_GVL_FUNC8(name, name)
+
+
+#define DEFINE_GVL_STRUCT9(name, type1, type2, type3, type4, type5, type6, type7, type8, type9) \
+    typedef struct { \
+        type1 arg1; \
+        type2 arg2; \
+        type3 arg3; \
+        type4 arg4; \
+        type5 arg5; \
+        type6 arg6; \
+        type7 arg7; \
+        type8 arg8; \
+        type9 arg9; \
+    } GVL_STRUCT_TYPE(name)
+#define DEFINE_GVL_FUNC9(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        return (void *)func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5, args->arg6, args->arg7, args->arg8, args->arg9); \
+    }
+#define DEFINE_GVL_STUB9(name, type1, type2, type3, type4, type5, type6, type7, type8, type9) \
+    DEFINE_GVL_STRUCT9(name, type1, type2, type3, type4, type5, type6, type7, type8, type9); \
+    DEFINE_GVL_FUNC9(name, name)
+
+
+#define DEFINE_GVL_VOID_FUNC2(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        func_name(args->arg1, args->arg2); \
+        return NULL; \
+    }
+#define DEFINE_GVL_VOID_STUB2(name, type1, type2) \
+    DEFINE_GVL_STRUCT2(name, type1, type2); \
+    DEFINE_GVL_VOID_FUNC2(name, name)
+
+
+#define DEFINE_GVL_VOID_FUNC3(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        func_name(args->arg1, args->arg2, args->arg3); \
+        return NULL; \
+    }
+#define DEFINE_GVL_VOID_STUB3(name, type1, type2, type3) \
+    DEFINE_GVL_STRUCT3(name, type1, type2, type3); \
+    DEFINE_GVL_VOID_FUNC3(name, name)
+
+
+#define DEFINE_GVL_VOID_FUNC6(func_name, struct_name) \
+    static void *func_name##_gvl(void *p) \
+    { \
+        GVL_STRUCT_TYPE(struct_name) *args = (GVL_STRUCT_TYPE(struct_name) *)p; \
+        func_name(args->arg1, args->arg2, args->arg3, args->arg4, args->arg5, args->arg6); \
+        return NULL; \
+    }
+#define DEFINE_GVL_VOID_STUB6(name, type1, type2, type3, type4, type5, type6) \
+    DEFINE_GVL_STRUCT6(name, type1, type2, type3, type4, type5, type6); \
+    DEFINE_GVL_VOID_FUNC6(name, name)
+
+#endif