rmagick 4.2.2 → 5.3.0

data/before_install_osx.sh

@@ -2,7 +2,7 @@
 
 set -euox pipefail
 
-gem install bundler
+gem install bundler -v 2.3.26 # Bundler 2.4.x has dropped support for Ruby 2.3
 
 if [ -v STYLE_CHECKS ]; then
   set +ux
@@ -16,10 +16,11 @@ 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 libxml2 zlib webp
+brew uninstall --force imagemagick imagemagick@6
+brew install wget ghostscript freetype jpeg little-cms2 openexr 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/libxml2 -I/usr/local/opt/zlib/include"
+export LDFLAGS="-L$(brew --prefix libxml2)/lib -L$(brew --prefix zlib)/lib -L$(brew --prefix glib)/lib -L$(brew --prefix openexr)/lib"
+export CPPFLAGS="-I$(brew --prefix libxml2)/include -I$(brew --prefix zlib)/include -I$(brew --prefix glib)/include/glib-2.0 -I$(brew --prefix glib)/lib/glib-2.0/include -I$(brew --prefix openexr)/include/OpenEXR"
 
 project_dir=$(pwd)
 build_dir="${project_dir}/build-ImageMagick/ImageMagick-${IMAGEMAGICK_VERSION}"
@@ -31,7 +32,7 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
 
   version=(${IMAGEMAGICK_VERSION//./ })
-  wget "https://imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
+  wget "https://imagemagick.org/archive/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   tar -xf "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   rm "ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz"
   mv "ImageMagick-${IMAGEMAGICK_VERSION}" "${build_dir}"
@@ -42,7 +43,7 @@ build_imagemagick() {
   fi
 
   cd "${build_dir}"
-  ./configure --prefix=/usr/local "${options}"
+  ./configure --prefix=/usr/local "${options}" --without-raw
   make -j
 }
 

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
@@ -9,6 +10,33 @@ module RMagick
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
 
+    # ImageMagick 6.7 package
+    IM6_7_PACKAGES = ['ImageMagick'].freeze
+
+    # ImageMagick 6.8+ packages
+    IM6_PACKAGES = %w[
+      ImageMagick-6.Q64HDRI
+      ImageMagick-6.Q32HDRI
+      ImageMagick-6.Q16HDRI
+      ImageMagick-6.Q8HDRI
+      ImageMagick-6.Q64
+      ImageMagick-6.Q32
+      ImageMagick-6.Q16
+      ImageMagick-6.Q8
+    ].freeze
+
+    # ImageMagick 7 packages
+    IM7_PACKAGES = %w[
+      ImageMagick-7.Q64HDRI
+      ImageMagick-7.Q32HDRI
+      ImageMagick-7.Q16HDRI
+      ImageMagick-7.Q8HDRI
+      ImageMagick-7.Q64
+      ImageMagick-7.Q32
+      ImageMagick-7.Q16
+      ImageMagick-7.Q8
+    ].freeze
+
     attr_reader :headers
 
     def initialize
@@ -41,7 +69,6 @@ module RMagick
       {
         magick_version: $magick_version,
         local_libs: $LOCAL_LIBS,
-        cflags: $CFLAGS,
         cppflags: $CPPFLAGS,
         ldflags: $LDFLAGS,
         defs: $defs,
@@ -68,19 +95,29 @@ module RMagick
         check_multiple_imagemagick_versions
         check_partial_imagemagick_versions
 
+        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
-        $CFLAGS     = "#{ENV['CFLAGS']} "   + `pkg-config --cflags #{$magick_package}`.chomp
-        $CPPFLAGS   = "#{ENV['CPPFLAGS']} " + `pkg-config --cflags #{$magick_package}`.chomp
-        $LDFLAGS    = "#{ENV['LDFLAGS']} "  + `pkg-config --libs #{$magick_package}`.chomp
-        $LOCAL_LIBS = "#{ENV['LIBS']} "     + `pkg-config --libs #{$magick_package}`.chomp
+        $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 = "#{original_ldflags} #{ldflags}"
+        end
 
         configure_archflags_for_osx($magick_package) if RUBY_PLATFORM =~ /darwin/ # osx
 
       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_')
@@ -92,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
 
-      $CFLAGS << (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)
@@ -116,31 +157,40 @@ module RMagick
       exit(1)
     end
 
+    def detect_imagemagick_packages(packages)
+      packages.select do |package|
+        PKGConfig.exist?(package)
+      end
+    end
+
+    def installed_im6_packages
+      @installed_im6_packages ||= detect_imagemagick_packages(IM6_PACKAGES)
+    end
+
+    def installed_im7_packages
+      @installed_im7_packages ||= detect_imagemagick_packages(IM7_PACKAGES)
+    end
+
     def determine_imagemagick_package
-      packages = `pkg-config --list-all`.scan(/(ImageMagick\-[\.A-Z0-9]+) .*/).flatten
+      packages = [installed_im7_packages, installed_im6_packages].flatten
 
-      # For ancient version of ImageMagick 6 we need a different regex
       if packages.empty?
-        packages = `pkg-config --list-all`.scan(/(ImageMagick) .*/).flatten
+        # ImageMagick 6.7 does not have package file like ImageMagick-6.Q16.pc
+        packages = detect_imagemagick_packages(IM6_7_PACKAGES)
       end
 
       if packages.empty?
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
       end
 
-      if packages.length > 1
-
-        im7_packages = packages.grep(/\AImageMagick-7/)
-
-        if im7_packages.any?
-          checking_for('forced use of ImageMagick 6') do
-            if ENV['USE_IMAGEMAGICK_6']
-              packages -= im7_packages
-              true
-            else
-              packages = im7_packages
-              false
-            end
+      if installed_im6_packages.any? && installed_im7_packages.any?
+        checking_for('forced use of ImageMagick 6') do
+          if ENV['USE_IMAGEMAGICK_6']
+            packages = installed_im6_packages
+            true
+          else
+            packages = installed_im7_packages
+            false
           end
         end
       end
@@ -212,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
@@ -258,7 +308,7 @@ module RMagick
         Retry with '--with-opt-dir' option.
         Usage: gem install rmagick -- '--with-opt-dir=\"[path to ImageMagick]\"'
         e.g.
-          gem install rmagick -- '--with-opt-dir=\"C:\Program Files\ImageMagick-6.9.1-Q16\"'
+          gem install rmagick -- '--with-opt-dir=\"C:\\Program Files\\ImageMagick-6.9.1-Q16\"'
       END_MINGW
     end
 
@@ -287,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)
@@ -314,7 +360,8 @@ module RMagick
 
     def create_header_file
       ruby_api = [
-        'rb_gc_adjust_memory_usage' # Ruby 2.4.0
+        'rb_gc_adjust_memory_usage', # Ruby 2.4.0
+        'rb_gc_mark_movable' # Ruby 2.7.0
       ]
       memory_api = %w[
         posix_memalign
@@ -353,9 +400,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)
@@ -90,8 +96,8 @@
 
 //! Trace new image creation in bang methods
 #define UPDATE_DATA_PTR(_obj_, _new_) \
-    do { (void) rm_trace_creation(_new_);\
-    DATA_PTR(_obj_) = (void *)(_new_);\
+    do { \
+        DATA_PTR(_obj_) = (void *)(_new_); \
     } while(0)
 
 
@@ -396,7 +402,6 @@ EXTERN VALUE Class_KernelInfoType;
 /**
 *   Commonly-used IDs
 */
-EXTERN ID rm_ID_trace_proc;        /**< "@trace_proc" */
 EXTERN ID rm_ID_call;              /**< "call" */
 EXTERN ID rm_ID_changed;           /**< "changed" */
 EXTERN ID rm_ID_cur_image;         /**< "cur_image" */
@@ -411,7 +416,13 @@ EXTERN ID rm_ID_push;              /**< "push" */
 EXTERN ID rm_ID_values;            /**< "values" */
 EXTERN ID rm_ID_width;             /**< "width" */
 
-EXTERN unsigned long long rm_main_thread_id;
+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 */
@@ -434,56 +445,56 @@ EXTERN unsigned long long rm_main_thread_id;
 #define R_boolean_to_C_boolean(attr) RTEST(attr) /**<  C boolean <- Ruby boolean */
 #define C_int_to_R_int(attr) INT2FIX(attr) /**< C int -> Ruby int */
 #define R_int_to_C_int(attr) NUM2INT(attr) /**< C int <- Ruby int */
-#define C_long_to_R_long(attr) INT2NUM(attr) /**< C long -> Ruby long */
+#define C_long_to_R_long(attr) LONG2NUM(attr) /**< C long -> Ruby long */
 #define R_long_to_C_long(attr) NUM2LONG(attr) /**< C long <- Ruby long */
-#define C_ulong_to_R_ulong(attr) UINT2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
+#define C_ulong_to_R_ulong(attr) ULONG2NUM(attr) /**< C unsigned long -> Ruby unsigned long */
 #define R_ulong_to_C_ulong(attr) NUM2ULONG(attr) /**< C unsigned long <- Ruby unsigned long */
 #define C_str_to_R_str(attr) attr ? rb_str_new2(attr) : Qnil /**< C string -> Ruby string */
 #define C_dbl_to_R_dbl(attr) rb_float_new(attr) /**< C double -> Ruby double */
 #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;\
     }
@@ -513,7 +524,6 @@ EXTERN unsigned long long rm_main_thread_id;
 #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 {\
@@ -521,7 +531,7 @@ EXTERN unsigned long long rm_main_thread_id;
    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)
 
@@ -1019,7 +1029,6 @@ extern VALUE Image_write(VALUE, VALUE);
 
 extern VALUE rm_image_new(Image *);
 extern void  rm_image_destroy(void *);
-extern void  rm_trace_creation(Image *);
 
 
 // rmfill.c
@@ -1043,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);
@@ -1173,6 +1181,9 @@ extern void   rm_set_user_artifact(Image *, Info *);
 extern void   rm_sync_image_options(Image *, Info *);
 extern void   rm_split(Image *);
 extern void   rm_magick_error(const char *);
+#if defined(IMAGEMAGICK_7)
+extern void   rm_set_pixelinfo_alpha(PixelInfo *, const MagickRealType);
+#endif
 
 //! whether to retain on errors
 typedef enum
@@ -1190,7 +1201,6 @@ typedef enum
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
 extern Image *rm_clone_image(Image *);
-extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
 extern VALUE  rm_exif_by_entry(Image *);
 extern VALUE  rm_exif_by_number(Image *);
 extern void   rm_get_optional_arguments(VALUE);
@@ -1199,7 +1209,6 @@ extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
 extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
 extern void   rm_raise_exception(ExceptionInfo *);
-extern unsigned long long rm_current_thread_id();
 #if defined(IMAGEMAGICK_6)
 extern void   rm_check_image_exception(Image *, ErrorRetention);
 #endif

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