rmagick 7.1.7 → 7.2.0

data/ext/RMagick/rmagick_gvl.h

@@ -2,13 +2,15 @@
 #define _RMAGICK_GVL_H_
 
 #include "ruby/thread.h"
+#include "ruby/fiber/scheduler.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)
+#if defined(RB_NOGVL_OFFLOAD_SAFE) && defined(HAVE_RB_FIBER_SCHEDULER_BLOCKING_OPERATION_EXTRACT)
+#define RMAGICK_OFFLOAD_SAFE 1
+#endif
 
 
 #define DEFINE_GVL_STRUCT1(name, type1) \

data/ext/RMagick/rmagick_gvl.hpp

@@ -0,0 +1,100 @@
+#ifndef _RMAGICK_GVL_HPP_
+#define _RMAGICK_GVL_HPP_
+
+extern void   rm_gvl_init(void);
+extern void   rm_gvl_check_readable(const void *);
+extern void   rm_gvl_check_writable(const void *);
+extern bool   rm_gvl_in_use(const void *);
+
+/**
+ * A call to an ImageMagick function without the GVL, which a Fiber scheduler
+ * with a worker pool may run on a worker thread. Register the Ruby objects the
+ * call uses and what the caller releases after it, then call run().
+ */
+class rm_gvl_call
+{
+public:
+    rm_gvl_call(gvl_function_t *fp, void *args);
+
+    rm_gvl_call &read(VALUE obj);
+    rm_gvl_call &read(const void *ptr);
+    rm_gvl_call &update(VALUE obj);
+    rm_gvl_call &update(const void *ptr);
+    rm_gvl_call &read_each(VALUE ary);
+    rm_gvl_call &update_each(VALUE ary);
+    rm_gvl_call &release(ExceptionInfo *exception);
+    rm_gvl_call &release(ImageInfo *info);
+    rm_gvl_call &release(DrawInfo *draw_info);
+    rm_gvl_call &release(KernelInfo *kernel);
+    rm_gvl_call &destroy(Image *image);
+    rm_gvl_call &split(Image *images);
+#if defined(IMAGEMAGICK_7)
+    rm_gvl_call &restore_mask(Image *image, ChannelType channel_mask);
+#endif
+    rm_gvl_call &free_buffer(void *buffer);
+    rm_gvl_call &relinquish(void *memory);
+    rm_gvl_call &free_result();
+    rm_gvl_call &keep_thread(bool keep = true);
+    rm_gvl_call &cleanup(void (*release)(void *, intptr_t), void *ptr, intptr_t arg = 0);
+    rm_gvl_call &restore(void (*release)(void *, intptr_t), void *ptr, intptr_t arg = 0, size_t size = 0);
+
+    template <typename T> T run();
+
+private:
+    enum ResultType { ResultIgnored, ResultImage, ResultMemory };
+    enum { MaxObjects = 4, MaxCleanups = 4 };
+
+    typedef struct
+    {
+        VALUE obj;
+        const void *ptr;
+        bool update;
+        bool each;
+    } object_t;
+
+    typedef struct
+    {
+        void (*release)(void *, intptr_t);
+        void *ptr;
+        intptr_t arg;
+        size_t size;
+        bool restore;
+    } cleanup_t;
+
+    gvl_function_t *fp;
+    void *args;
+    object_t objects[MaxObjects];
+    int nobjects;
+    cleanup_t cleanups[MaxCleanups];
+    int ncleanups;
+    ResultType result_type;
+    bool keep;
+
+    rm_gvl_call &add_object(VALUE obj, const void *ptr, bool update, bool each);
+    rm_gvl_call &add_cleanup(void (*release)(void *, intptr_t), void *ptr, intptr_t arg, size_t size, bool restore);
+    void *call(ResultType type);
+    void *call_here(ResultType type);
+    void unwind(ResultType type, void *result, bool abandoned = false);
+};
+
+template <typename T>
+T
+rm_gvl_call::run()
+{
+    return (T)(uintptr_t)call(result_type);
+}
+
+template <> Image *rm_gvl_call::run<Image *>();
+template <> void rm_gvl_call::run<void>();
+
+//! declare the arguments of the GVL stub of name and an rm_gvl_call named var that calls it
+#define DECLARE_GVL_CALL(var, name, ...) \
+    GVL_STRUCT_TYPE(name) var##_args = { __VA_ARGS__ }; \
+    rm_gvl_call var(GVL_FUNC(name), &var##_args)
+
+//! declare the arguments of type and an rm_gvl_call named var that calls fp with them
+#define DECLARE_GVL_CALL_FP(var, type, fp, ...) \
+    GVL_STRUCT_TYPE(type) var##_args = { __VA_ARGS__ }; \
+    rm_gvl_call var(fp, &var##_args)
+
+#endif

data/ext/RMagick/rmdraw.cpp

@@ -74,6 +74,28 @@ get_draw(VALUE self)
 }
 
 
+/**
+ * Get the Draw struct of a Draw object for a method that changes it.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param self the Draw object
+ * @return the initialized Draw struct
+ * @throw FrozenError if the Draw object is frozen
+ * @throw RuntimeError if an offloaded call is using the Draw object
+ */
+static Draw *
+get_writable_draw(VALUE self)
+{
+    Draw *draw;
+
+    rb_check_frozen(self);
+    draw = get_draw(self);
+    rm_gvl_check_writable(draw);
+    return draw;
+}
+
+
 /**
  * Set the affine matrix from an {Magick::AffineMatrix}.
  *
@@ -85,8 +107,7 @@ Draw_affine_eq(VALUE self, VALUE matrix)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     Export_AffineMatrix(&draw->info->affine, matrix);
     return matrix;
 }
@@ -103,8 +124,7 @@ Draw_align_eq(VALUE self, VALUE align)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     VALUE_TO_ENUM(align, draw->info->align, AlignType);
     return align;
 }
@@ -121,8 +141,7 @@ Draw_decorate_eq(VALUE self, VALUE decorate)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     VALUE_TO_ENUM(decorate, draw->info->decorate, DecorationType);
     return decorate;
 }
@@ -139,8 +158,7 @@ Draw_density_eq(VALUE self, VALUE density)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     magick_clone_string(&draw->info->density, StringValueCStr(density));
 
     return density;
@@ -158,8 +176,7 @@ Draw_encoding_eq(VALUE self, VALUE encoding)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     magick_clone_string(&draw->info->encoding, StringValueCStr(encoding));
 
     return encoding;
@@ -177,8 +194,7 @@ Draw_fill_eq(VALUE self, VALUE fill)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     Color_to_PixelColor(&draw->info->fill, fill);
     return fill;
 }
@@ -198,8 +214,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
 
     if (draw->info->fill_pattern != NULL)
     {
@@ -213,7 +228,7 @@ Draw_fill_pattern_eq(VALUE self, VALUE pattern)
         Image *image;
 
         pattern = rm_cur_image(pattern);
-        image = rm_check_destroyed(pattern);
+        image = rm_check_readable(pattern);
         // Do not trace creation
         draw->info->fill_pattern = rm_clone_image(image);
     }
@@ -233,8 +248,7 @@ Draw_font_eq(VALUE self, VALUE font)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     magick_clone_string(&draw->info->font, StringValueCStr(font));
 
     return font;
@@ -252,8 +266,7 @@ Draw_font_family_eq(VALUE self, VALUE family)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     magick_clone_string(&draw->info->family, StringValueCStr(family));
 
     return family;
@@ -271,8 +284,7 @@ Draw_font_stretch_eq(VALUE self, VALUE stretch)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     VALUE_TO_ENUM(stretch, draw->info->stretch, StretchType);
     return stretch;
 }
@@ -289,8 +301,7 @@ Draw_font_style_eq(VALUE self, VALUE style)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     VALUE_TO_ENUM(style, draw->info->style, StyleType);
     return style;
 }
@@ -309,8 +320,7 @@ Draw_font_weight_eq(VALUE self, VALUE weight)
     Draw *draw;
     size_t w;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
 
     if (FIXNUM_P(weight))
     {
@@ -375,8 +385,7 @@ Draw_gravity_eq(VALUE self, VALUE grav)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     VALUE_TO_ENUM(grav, draw->info->gravity, GravityType);
 
     return grav;
@@ -394,8 +403,7 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->kerning = NUM2DBL(kerning);
     return kerning;
 }
@@ -412,8 +420,7 @@ Draw_interline_spacing_eq(VALUE self, VALUE spacing)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->interline_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -430,8 +437,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->interword_spacing = NUM2DBL(spacing);
     return spacing;
 }
@@ -463,8 +469,8 @@ image_to_str(Image *image)
 
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        GVL_STRUCT_TYPE(ImageToBlob) args = { info, image, &length, exception };
-        blob = (unsigned char *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImageToBlob), &args);
+        DECLARE_GVL_CALL(call, ImageToBlob, info, image, &length, exception);
+        blob = call.keep_thread().run<unsigned char *>();
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -504,8 +510,8 @@ Image *str_to_image(VALUE str)
 
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
-        GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), (size_t)RSTRING_LEN(str), exception };
-        image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
+        DECLARE_GVL_CALL(call, BlobToImage, info, RSTRING_PTR(str), (size_t)RSTRING_LEN(str), exception);
+        image = call.keep_thread().run<Image *>();
         DestroyImageInfo(info);
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
@@ -668,8 +674,7 @@ Draw_pointsize_eq(VALUE self, VALUE pointsize)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->pointsize = NUM2DBL(pointsize);
     return pointsize;
 }
@@ -688,8 +693,7 @@ Draw_rotation_eq(VALUE self, VALUE deg)
     double degrees;
     AffineMatrix affine, current;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
 
     degrees = NUM2DBL(deg);
     if (fabs(degrees) > DBL_EPSILON)
@@ -724,8 +728,7 @@ Draw_stroke_eq(VALUE self, VALUE stroke)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     Color_to_PixelColor(&draw->info->stroke, stroke);
     return stroke;
 }
@@ -744,8 +747,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
 
     if (draw->info->stroke_pattern != NULL)
     {
@@ -760,7 +762,7 @@ Draw_stroke_pattern_eq(VALUE self, VALUE pattern)
 
         // DestroyDrawInfo destroys the clone
         pattern = rm_cur_image(pattern);
-        image = rm_check_destroyed(pattern);
+        image = rm_check_readable(pattern);
         // Do not trace creation
         draw->info->stroke_pattern = rm_clone_image(image);
     }
@@ -780,8 +782,7 @@ Draw_stroke_width_eq(VALUE self, VALUE stroke_width)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->stroke_width = NUM2DBL(stroke_width);
     return stroke_width;
 }
@@ -798,8 +799,7 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     draw->info->text_antialias = (MagickBooleanType) RTEST(text_antialias);
     return text_antialias;
 }
@@ -829,8 +829,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     Color_to_PixelColor(&draw->info->undercolor, undercolor);
     return undercolor;
 }
@@ -868,9 +867,12 @@ annotate_ensure(VALUE arg)
     struct Draw_annotate_args *annotate = (struct Draw_annotate_args *)arg;
     Draw *draw = annotate->draw;
 
-    magick_free(draw->info->text);
-    draw->info->text = NULL;
-    draw->info->affine = annotate->keep;
+    if (!rm_gvl_in_use(draw))
+    {
+        magick_free(draw->info->text);
+        draw->info->text = NULL;
+        draw->info->affine = annotate->keep;
+    }
 
 #if defined(IMAGEMAGICK_7)
     if (annotate->exception)
@@ -930,23 +932,24 @@ annotate_body(VALUE arg)
         snprintf(geometry_str, sizeof(geometry_str), "%lux%lu%+ld%+ld", width, height, x, y);
     }
 
-    magick_clone_string(&draw->info->geometry, geometry_str);
-
     // Store in Draw structure. The text is drawn as given: it is not run
     // through InterpretImageProperties(), so a `%[...]` or `%x` escape in it is
     // not expanded. Everything those escapes provide is available directly from
     // Ruby -- Image#columns, Image#filename, Image#artifact and so on.
     embed_text = StringValueCStr(annotate->text);
     image = rm_check_frozen(annotate->image_arg);
+    rm_gvl_check_writable(draw);
+
+    magick_clone_string(&draw->info->geometry, geometry_str);
     draw->info->text = ConstantString(embed_text);
 
 #if defined(IMAGEMAGICK_7)
     annotate->exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info, annotate->exception };
+    DECLARE_GVL_CALL(call, AnnotateImage, image, draw->info, annotate->exception);
 #else
-    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info };
+    DECLARE_GVL_CALL(call, AnnotateImage, image, draw->info);
 #endif
-    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnnotateImage), &args);
+    call.update(annotate->image_arg).update(annotate->self).run<void>();
 
 #if defined(IMAGEMAGICK_7)
     exception = annotate->exception;
@@ -991,6 +994,7 @@ VALUE Draw_annotate(
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
     annotate.draw = get_draw(self);
+    rm_gvl_check_writable(annotate.draw);
     annotate.keep = annotate.draw->info->affine;
 
     annotate.self       = self;
@@ -1057,7 +1061,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
 
     // Retrieve the image to composite
     image = rm_cur_image(argv[4]);
-    comp_img = rm_check_destroyed(image);
+    comp_img = rm_check_readable(image);
 
     x = NUM2DBL(argv[0]);
     y = NUM2DBL(argv[1]);
@@ -1102,6 +1106,26 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
 }
 
 
+// Release what Draw#draw and get_type_metrics() set on the DrawInfo for one call
+static void
+free_primitive(void *ptr, intptr_t arg ATTRIBUTE_UNUSED)
+{
+    Draw *draw = (Draw *)ptr;
+
+    magick_free(draw->info->primitive);
+    draw->info->primitive = NULL;
+}
+
+static void
+free_text(void *ptr, intptr_t arg ATTRIBUTE_UNUSED)
+{
+    Draw *draw = (Draw *)ptr;
+
+    magick_free(draw->info->text);
+    draw->info->text = NULL;
+}
+
+
 /**
  * Execute the stored drawing primitives on the current image.
  *
@@ -1122,6 +1146,7 @@ Draw_draw(VALUE self, VALUE image_arg)
     image = rm_check_frozen(image_arg);
 
     draw = get_draw(self);
+    rm_gvl_check_writable(draw);
     if (draw->primitives == 0)
     {
         rb_raise(rb_eArgError, "nothing to draw");
@@ -1132,11 +1157,12 @@ Draw_draw(VALUE self, VALUE image_arg)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info, exception };
+    DECLARE_GVL_CALL(call, DrawImage, image, draw->info, exception);
+    call.release(exception);
 #else
-    GVL_STRUCT_TYPE(DrawImage) args = { image, draw->info };
+    DECLARE_GVL_CALL(call, DrawImage, image, draw->info);
 #endif
-    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(DrawImage), &args);
+    call.update(image_arg).update(self).restore(free_primitive, draw).run<void>();
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
@@ -1576,8 +1602,7 @@ PolaroidOptions_border_color_eq(VALUE self, VALUE border)
 {
     Draw *draw;
 
-    rb_check_frozen(self);
-    draw = get_draw(self);
+    draw = get_writable_draw(self);
     Color_to_PixelColor(&draw->info->border_color, border);
     return border;
 }
@@ -1669,7 +1694,7 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
             break;
         case 2:
             t = rm_cur_image(argv[0]);
-            image = rm_check_destroyed(t);
+            image = rm_check_readable(t);
             text_arg = argv[1];
             text = rm_str2cstr(&text_arg, &text_l);
             break;                  // okay
@@ -1684,16 +1709,22 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
     }
 
     draw = get_draw(self);
+    rm_gvl_check_writable(draw);
     // Measured as given: see the comment in Draw_annotate().
     draw->info->text = ConstantString(text);
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics, exception };
+    DECLARE_GVL_CALL_FP(call, get_type_metrics, fp, image, draw->info, &metrics, exception);
+    call.release(exception);
 #else
-    GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };
+    DECLARE_GVL_CALL_FP(call, get_type_metrics, fp, image, draw->info, &metrics);
 #endif
-    void *ret = CALL_FUNC_WITHOUT_GVL(fp, &args);
+    if (argc == 2)
+    {
+        call.read(t);
+    }
+    void *ret = call.update(self).restore(free_text, draw).run<void *>();
     okay = static_cast<MagickBooleanType>(reinterpret_cast<intptr_t &>(ret));
 
     magick_free(draw->info->text);

data/ext/RMagick/rmfill.cpp

@@ -191,8 +191,8 @@ point_fill(
 #endif
         }
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
     }
 
@@ -261,8 +261,8 @@ vertical_fill(
             row_pixels += GetPixelChannels(image);
         }
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
     }
 
@@ -295,8 +295,8 @@ vertical_fill(
 
         memcpy(row_pixels, master, image->columns * sizeof(PixelPacket));
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         if (rm_should_raise_exception(exception, RetainExceptionRetention))
         {
             xfree((void *)master);
@@ -369,8 +369,8 @@ horizontal_fill(
             row_pixels += GetPixelChannels(image);
         }
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
     }
 
@@ -402,8 +402,8 @@ horizontal_fill(
 
         memcpy(col_pixels, master, image->rows * sizeof(PixelPacket));
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         if (rm_should_raise_exception(exception, RetainExceptionRetention))
         {
             xfree((void *)master);
@@ -514,8 +514,8 @@ v_diagonal_fill(
 #endif
         }
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
     }
 
@@ -621,8 +621,8 @@ h_diagonal_fill(
 #endif
         }
 
-        GVL_STRUCT_TYPE(SyncAuthenticPixels) args = { image, exception };
-        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SyncAuthenticPixels), &args);
+        DECLARE_GVL_CALL(call, SyncAuthenticPixels, image, exception);
+        call.keep_thread().run<void>();
         CHECK_EXCEPTION();
     }
 
@@ -645,7 +645,7 @@ GradientFill_fill(VALUE self, VALUE image_obj)
     double x1, y1, x2, y2;          // points on the line
 
     TypedData_Get_Struct(self, rm_GradientFill, &rm_gradient_fill_data_type, fill);
-    image = rm_check_destroyed(rm_cur_image(image_obj));
+    image = rm_check_writable(rm_cur_image(image_obj));
 
     x1 = fill->x1;
     y1 = fill->y1;
@@ -765,7 +765,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
     texture_image = rm_cur_image(texture_arg);
 
     // Bump the reference count on the texture image.
-    texture = rm_check_destroyed(texture_image);
+    texture = rm_check_readable(texture_image);
     ReferenceImage(texture);
 
     fill->texture = texture;
@@ -791,7 +791,7 @@ TextureFill_fill(VALUE self, VALUE image_obj)
     ExceptionInfo *exception;
 #endif
 
-    image = rm_check_destroyed(rm_cur_image(image_obj));
+    image = rm_check_writable(rm_cur_image(image_obj));
     TypedData_Get_Struct(self, rm_TextureFill, &rm_texture_fill_data_type, fill);
 
 #if defined(IMAGEMAGICK_7)