sink: fix ->processed data race on 64-bit platforms

kleisauke · kleisauke · commit e13d3789ee5e · 2026-03-31T09:52:42.000+02:00
diff --git a/libvips/iofuncs/sink.c b/libvips/iofuncs/sink.c
@@ -237,7 +237,12 @@ sink_area_allocate_fn(VipsThreadState *state, void *a, gboolean *stop)
 
 	/* Add the number of pixels we've just allocated to progress.
 	 */
+#if GLIB_SIZEOF_VOID_P >= 8
+	g_atomic_pointer_add(&sink_base->processed,
+		(guint64) state->pos.width * state->pos.height);
+#else
 	sink_base->processed += (guint64) state->pos.width * state->pos.height;
+#endif
 
 	return 0;
 }
@@ -428,13 +433,19 @@ int
 vips_sink_base_progress(void *a)
 {
 	SinkBase *sink_base = (SinkBase *) a;
+	guint64 processed =
+#if GLIB_SIZEOF_VOID_P >= 8
+		g_atomic_pointer_get(&sink_base->processed);
+#else
+		sink_base->processed;
+#endif
 
 	VIPS_DEBUG_MSG("vips_sink_base_progress:\n");
 
 	/* Trigger any eval callbacks on our source image and
 	 * check for errors.
 	 */
-	vips_image_eval(sink_base->im, sink_base->processed);
+	vips_image_eval(sink_base->im, processed);
 	if (vips_image_iskilled(sink_base->im))
 		return -1;
 
diff --git a/libvips/iofuncs/sinkdisc.c b/libvips/iofuncs/sinkdisc.c
@@ -417,7 +417,12 @@ wbuffer_allocate_fn(VipsThreadState *state, void *a, gboolean *stop)
 
 	/* Add the number of pixels we've just allocated to progress.
 	 */
+#if GLIB_SIZEOF_VOID_P >= 8
+	g_atomic_pointer_add(&sink_base->processed,
+		(guint64) state->pos.width * state->pos.height);
+#else
 	sink_base->processed += (guint64) state->pos.width * state->pos.height;
+#endif
 
 	return 0;
 }
diff --git a/libvips/iofuncs/sinkmemory.c b/libvips/iofuncs/sinkmemory.c
@@ -242,7 +242,12 @@ sink_memory_area_allocate_fn(VipsThreadState *state, void *a, gboolean *stop)
 
 	/* Add the number of pixels we've just allocated to progress.
 	 */
+#if GLIB_SIZEOF_VOID_P >= 8
+	g_atomic_pointer_add(&sink_base->processed,
+		(guint64) state->pos.width * state->pos.height);
+#else
 	sink_base->processed += (guint64) state->pos.width * state->pos.height;
+#endif
 
 	return 0;
 }
diff --git a/suppressions/tsan.supp b/suppressions/tsan.supp
@@ -11,9 +11,6 @@ race_top:vips_progress_update
 # Unsynchronized TRUE assignment to wbuffer->kill
 race_top:wbuffer_free
 
-# Unsynchronized read of sink_base->processed
-race_top:vips_sink_base_progress
-
 # Unsynchronized read of write->buf->write_errno
 race_top:write_check_error
 
diff --git a/suppressions/valgrind.supp b/suppressions/valgrind.supp
@@ -544,13 +544,6 @@
    fun:clone
 }
 
-# unlocked read of pixels-processed-so-far, which is fine
-{
-   helgrind4
-   Helgrind:Race
-   fun:vips_sink_base_progress
-}
-
 # helgrind can't see g_private
 {
    helgrind5

Original file line number	Diff line number	Diff line change
`@@ -544,13 +544,6 @@`
`544`	`544`	`fun:clone`
`545`	`545`	`}`
`546`	`546`
`547`		`-# unlocked read of pixels-processed-so-far, which is fine`
`548`		`-{`
`549`		`- helgrind4`
`550`		`- Helgrind:Race`
`551`		`- fun:vips_sink_base_progress`
`552`		`-}`
`553`		`-`
`554`	`547`	`# helgrind can't see g_private`
`555`	`548`	`{`
`556`	`549`	`helgrind5`