From 6babfbb56407c3da57ee41aa53fc9c25dc4506c3 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 3 Oct 2022 08:32:11 +0300 Subject: Remove private pthread_stop_world.h and darwin_stop_world.h (refactoring) * Makefile.direct (SRCS): Remove pthread_stop_world.h and darwin_stop_world.h items. * include/include.am (dist_noinst_HEADERS): Likewise. * darwin_stop_world.c [!GC_NO_THREADS_DISCOVERY && MPROTECT_VDB] (GC_darwin_register_mach_handler_thread): Change to no-argument GC_darwin_register_self_mach_handler(). * include/private/darwin_stop_world.h: Remove. * include/private/pthread_stop_world.h: Likewise. * include/private/gc_priv.h [GC_DARWIN_THREADS && MPROTECT_VDB] (GC_mprotect_stop, GC_mprotect_resume): Move declaration from darwin_stop_world.h. * include/private/gc_priv.h [GC_DARWIN_THREADS && MPROTECT_VDB && !GC_NO_THREADS_DISCOVERY] (GC_darwin_register_mach_handler_thread): Move declaration from darwin_stop_world.h and change to GC_darwin_register_self_mach_handler(). * include/private/pthread_support.h [GC_DARWIN_THREADS]: Move include of mach.h and thread_act.h from darwin_stop_world.h. * include/private/pthread_support.h [GC_DARWIN_THREADS]: Do not include darwin_stop_world.h. * os_dep.c [GC_DARWIN_THREADS && MPROTECT_VDB]: Likewise. * include/private/pthread_support.h [GC_DARWIN_THREADS] (thread_stop_info, GC_FindTopOfStack, GC_is_mach_marker): Move from darwin_stop_world.h. * include/private/pthread_support.h [!GC_DARWIN_THREADS && PTHREAD_STOP_WORLD_IMPL]: Do not include pthread_stop_world.h. * include/private/pthread_support.h [!GC_DARWIN_THREADS && PTHREAD_STOP_WORLD_IMPL] (thread_stop_info, GC_stop_init): Move from pthread_stop_world.h. * os_dep.c [MPROTECT_VDB && DARWIN && THREADS && !GC_NO_THREADS_DISCOVERY] (GC_mprotect_thread): Call GC_darwin_register_self_mach_handler() instead of GC_darwin_register_mach_handler_thread(mach_thread_self()). --- Makefile.direct | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile.direct') diff --git a/Makefile.direct b/Makefile.direct index 5a0b4da8..fbd39ec9 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -119,8 +119,7 @@ SRCS= $(CSRCS) \ include/private/specific.h include/gc/leak_detector.h \ include/gc/gc_pthread_redirects.h include/private/gc_atomic_ops.h \ include/gc/gc_config_macros.h include/private/pthread_support.h \ - include/private/pthread_stop_world.h include/private/darwin_semaphore.h \ - include/private/darwin_stop_world.h include/private/thread_local_alloc.h \ + include/private/darwin_semaphore.h include/private/thread_local_alloc.h \ ia64_save_regs_in_stack.s sparc_mach_dep.S \ sparc_netbsd_mach_dep.s $(CORD_SRCS) -- cgit v1.2.1