diff options
author | Andy Wingo <wingo@pobox.com> | 2025-04-22 10:21:20 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2025-04-22 10:36:30 +0200 |
commit | 27f0490801c77d3bd97aee9e9edd33d58176e08f (patch) | |
tree | ad2de7ed7e539b0576eb87ccf1c376912496059f /libguile/print.c | |
parent | 55e9d0672bc76e2bfa46c8b2e34d041ae39ba960 (diff) | |
download | guile-27f0490801c77d3bd97aee9e9edd33d58176e08f.tar.gz |
Use Whippet API to boot threads
* libguile/scm.h (scm_tc7_thread): Give threads their own tc7.
* libguile/threads.h (struct scm_thread): Add a tag, so that struct
thread can be a SCM directly. Add a struct gc_mutator* member.
(scm_thread_handle): New inline function.
(SCM_I_IS_THREAD, SCM_I_THREAD_DATA, SCM_VALIDATE_THREAD): Update to use
tc7 instead of SMOB tags.
* libguile/continuations.c (scm_i_with_continuation_barrier)
* libguile/finalizers.c (queue_finalizer_async)
* libguile/jit.c (compile_current_thread)
* libguile/threads.c (block_self, guilify_self_2)
(lock_mutex, unlock_mutex, timed_wait scm_current_thread)
(scm_all_threads)
* libguile/vm-engine.c (current-thread): Use scm_thread_handle instead
of thread->handle.
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/goops.c (class_thread, scm_class_of, scm_sys_goops_early_init)
* libguile/print.c (iprin1)
* module/language/cps/compile-bytecode.scm (compile-function)
* module/oop/goops.scm (<thread>)
* module/system/base/types.scm (cell->object)
* module/system/base/types/internal.scm (heap-tags)
* module/system/vm/assembler.scm: (emit-thread?): Adapt to
scm_tc7_thread.
* libguile/gc-internal.h: Move init functions that take "struct
gc_stack_addr" here, so that internal Whippet uses don't cause Whippet
to be added to public headers.
* libguile/gc.c (scm_storage_prehistory): Take struct gc_stack_addr as
arg, and pass to gc_init. Return a mutator pointer.
* libguile/init.c (scm_i_init_guile): Pass mutator and stack base to GC
and thread init routines.
* libguile/threads.c (scm_trace_dynstack, scm_trace_thread)
(scm_trace_thread_mutator_roots): New infra for marking threads in terms
of Whippet API.
* libguile/threads.c (guilify_self_1): Since we don't use a separate GC
kind for threads any more, and thread marking is keyed off
gc_mutator_set_roots, we can avoid some of the gnarly synchronization.
(on_thread_exit): Arrange to gc_finish_for_thread.
(scm_i_init_thread_for_guile): Use gc_init_for_thread.
(init_main_thread, with_guile, scm_i_with_guile): Use Whippet API.
(scm_threads_prehistory): Take main-thread mutator and the stack base as
arguments.
* libguile/vm.c (scm_trace_vm): Rework in terms of Whippet API.
* libguile/whippet-embedder.h (gc_trace_mutator_roots): Arrange to trace
the current mutator's SCM thread object.
* libguile/trace.h: New file, to declare implementations of trace
routines.
* libguile/Makefile.am (noinst_HEADERS): Add trace.h.
Diffstat (limited to 'libguile/print.c')
-rw-r--r-- | libguile/print.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libguile/print.c b/libguile/print.c index b10f0f8a8..58b88e908 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -1,4 +1,4 @@ -/* Copyright 1995-2004,2006,2008-2019 +/* Copyright 1995-2004,2006,2008-2019,2025 Free Software Foundation, Inc. This file is part of Guile. @@ -760,6 +760,9 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate) case scm_tc7_bitvector: scm_i_print_bitvector (exp, port, pstate); break; + case scm_tc7_thread: + scm_i_print_thread (exp, port, pstate); + break; case scm_tc7_wvect: ENTER_NESTED_DATA (pstate, exp, circref); scm_puts ("#w(", port); |