Ludovic Courtès wrote 2 weeks ago
[PATCH] Exclude the finalizer thread from the ‘all-threads’ result.
(address . bug-guile@gnu.org)
20250226145520.19492-1-ludo@gnu.org
Fixes https://bugs.gnu.org/76343.
Fixes a bug whereby “echo '(environ)' | guile” would wrongfully trigger
the multiple-thread warning.
* libguile/finalizers.c (finalizer_thread): New variable.
(finalization_thread_proc): Set it.
(scm_i_is_finalizer_thread): New function.
(run_finalization_thread): Clear FINALIZER_THREAD.
* libguile/finalizers.h (scm_i_is_finalizer_thread): New declaration.
* libguile/threads.c (scm_all_threads): Use it.
* NEWS: Update.
Reported-by: Simon Josefsson <simon@josefsson.org>
---
NEWS | 8 +++++++-
libguile/finalizers.c | 21 ++++++++++++++++++---
libguile/finalizers.h | 5 ++++-
libguile/threads.c | 7 +++++--
4 files changed, 34 insertions(+), 7 deletions(-)
Toggle diff (136 lines)
diff --git a/NEWS b/NEWS
index 3328a03cf..2a59874d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
Guile NEWS --- history of user-visible changes.
-Copyright (C) 1996-2024 Free Software Foundation, Inc.
+Copyright (C) 1996-2025 Free Software Foundation, Inc.
See the end for copying conditions.
Please send Guile bug reports to bug-guile@gnu.org.
@@ -69,6 +69,12 @@ every line in a file.
** Immutable stringbufs are now 8-byte aligned on all systems
Previously they could end up with an alignment that violated the type
tag for their type (e.g. ending up tagged as immediates SCM_IMP()).
+** 'all-threads' no longer includes the finalizer thread
+ (<https://bugs.gnu.org/76343>)
+ Previously 'all-threads' would include the finalizer thread. This,
+ in turn, would trigger warnings from 'primitive-fork' and 'environ'
+ suggesting they are being called in a multi-threaded context, when in
+ fact user code did not create any thread.
Changes in 3.0.10 (since 3.0.9)
diff --git a/libguile/finalizers.c b/libguile/finalizers.c
index 1370755bf..47495b595 100644
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@ -1,4 +1,4 @@
-/* Copyright 2012-2014,2018-2020,2022
+/* Copyright 2012-2014,2018-2020,2022,2025
Free Software Foundation, Inc.
This file is part of Guile.
@@ -37,6 +37,7 @@
#include "gsubr.h"
#include "init.h"
#include "threads.h"
+#include "atomics-internal.h"
#include "finalizers.h"
@@ -217,10 +218,14 @@ read_finalization_pipe_data (void *data)
return NULL;
}
-
+
+static scm_i_pthread_t finalizer_thread;
+
static void*
finalization_thread_proc (void *unused)
{
+ scm_atomic_set_pointer ((void **) &finalizer_thread,
+ (void *) pthread_self ());
while (1)
{
struct finalization_pipe_data data;
@@ -255,10 +260,20 @@ finalization_thread_proc (void *unused)
}
}
+int
+scm_i_is_finalizer_thread (struct scm_thread *t)
+{
+ scm_i_pthread_t us =
+ (scm_i_pthread_t) scm_atomic_ref_pointer ((void **) &finalizer_thread);
+ return pthread_equal (t->pthread, us);
+}
+
static void*
run_finalization_thread (void *arg)
{
- return scm_with_guile (finalization_thread_proc, arg);
+ void *res = scm_with_guile (finalization_thread_proc, arg);
+ scm_atomic_set_pointer ((void **) &finalizer_thread, NULL);
+ return res;
}
static void
diff --git a/libguile/finalizers.h b/libguile/finalizers.h
index 44bafb22e..a92a74be1 100644
--- a/libguile/finalizers.h
+++ b/libguile/finalizers.h
@@ -1,7 +1,7 @@
#ifndef SCM_FINALIZERS_H
#define SCM_FINALIZERS_H
-/* Copyright 2012, 2013, 2014, 2018
+/* Copyright 2012, 2013, 2014, 2018, 2025
Free Software Foundation, Inc.
This file is part of Guile.
@@ -42,6 +42,9 @@ SCM_INTERNAL void scm_i_finalizer_pre_fork (void);
thread. */
SCM_INTERNAL void scm_i_register_async_gc_callback (void (*callback) (void));
+/* Return true if THREAD is the finalizer thread. */
+SCM_INTERNAL int scm_i_is_finalizer_thread (struct scm_thread *thread);
+
SCM_API int scm_set_automatic_finalization_enabled (int enabled_p);
SCM_API int scm_run_finalizers (void);
diff --git a/libguile/threads.c b/libguile/threads.c
index 77e99da74..6b4510d53 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1,4 +1,4 @@
-/* Copyright 1995-1998,2000-2014,2018-2019,2023-2024
+/* Copyright 1995-1998,2000-2014,2018-2019,2023-2025
Free Software Foundation, Inc.
This file is part of Guile.
@@ -47,6 +47,7 @@
#include "dynwind.h"
#include "eval.h"
#include "extensions.h"
+#include "finalizers.h"
#include "fluids.h"
#include "gc-inline.h"
#include "gc.h"
@@ -1691,7 +1692,9 @@ SCM_DEFINE (scm_all_threads, "all-threads", 0, 0, 0,
for (t = all_threads; t && n > 0; t = t->next_thread)
{
- if (!t->exited && !scm_i_is_signal_delivery_thread (t))
+ if (!t->exited
+ && !scm_i_is_signal_delivery_thread (t)
+ && !scm_i_is_finalizer_thread (t))
{
SCM_SETCAR (*l, t->handle);
l = SCM_CDRLOC (*l);
base-commit: f6359a4715d023761454f1bf945633ce4cca98fc
--
2.48.1