#ifndef LISP_FEATURE_WIN32
#include <sched.h>
#endif
-#include <signal.h>
+#include "runtime.h"
#include <stddef.h>
#include <errno.h>
#include <sys/types.h>
#include "interrupt.h"
#include "lispregs.h"
-#ifdef LISP_FEATURE_WIN32
-/*
- * Win32 doesn't have SIGSTKSZ, and we're not switching stacks anyway,
- * so define it arbitrarily
- */
-#define SIGSTKSZ 1024
+#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THREAD)
+# define IMMEDIATE_POST_MORTEM
#endif
#if defined(LISP_FEATURE_DARWIN) && defined(LISP_FEATURE_SB_THREAD)
#endif
#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
-extern lispobj call_into_lisp_first_time(lispobj fun, lispobj *args, int nargs);
+extern lispobj call_into_lisp_first_time(lispobj fun, lispobj *args, int nargs)
+# ifdef LISP_FEATURE_X86_64
+ __attribute__((sysv_abi))
+# endif
+ ;
#endif
static void
th->next->prev = th->prev;
}
+#ifndef LISP_FEATURE_SB_SAFEPOINT
/* Only access thread state with blockables blocked. */
lispobj
thread_state(struct thread *thread)
}
thread_sigmask(SIG_SETMASK, &old, NULL);
}
-#endif
+#endif /* sb-safepoint */
+#endif /* sb-thread */
static int
initial_thread_trampoline(struct thread *th)
function = th->no_tls_value_marker;
th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG;
if(arch_os_thread_init(th)==0) return 1;
-#ifdef LISP_FEATURE_SB_SAFEPOINT
- pthread_mutex_lock(thread_qrl(th));
-#endif
link_thread(th);
th->os_thread=thread_self();
#ifndef LISP_FEATURE_WIN32
protect_control_stack_hard_guard_page(1, NULL);
+#endif
protect_binding_stack_hard_guard_page(1, NULL);
protect_alien_stack_hard_guard_page(1, NULL);
+#ifndef LISP_FEATURE_WIN32
protect_control_stack_guard_page(1, NULL);
+#endif
protect_binding_stack_guard_page(1, NULL);
protect_alien_stack_guard_page(1, NULL);
-#endif
#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
return call_into_lisp_first_time(function,args,0);
}
#ifdef LISP_FEATURE_SB_THREAD
+
+# if defined(IMMEDIATE_POST_MORTEM)
+
+/*
+ * If this feature is set, we are running on a stack managed by the OS,
+ * and no fancy delays are required for anything. Just do it.
+ */
+static void
+schedule_thread_post_mortem(struct thread *corpse)
+{
+ pthread_detach(pthread_self());
+ gc_assert(!pthread_attr_destroy(corpse->os_attr));
+ free(corpse->os_attr);
+#if defined(LISP_FEATURE_WIN32)
+ os_invalidate_free(corpse->os_address, THREAD_STRUCT_SIZE);
+#else
+ os_invalidate(corpse->os_address, THREAD_STRUCT_SIZE);
+#endif
+}
+
+# else
+
/* THREAD POST MORTEM CLEANUP
*
* Memory allocated for the thread stacks cannot be reclaimed while
}
}
-/* this is the first thing that runs in the child (which is why the
- * silly calling convention). Basically it calls the user's requested
- * lisp function after doing arch_os_thread_init and whatever other
- * bookkeeping needs to be done
- */
-int
-new_thread_trampoline(struct thread *th)
+# endif /* !IMMEDIATE_POST_MORTEM */
+
+/* Note: scribble must be stack-allocated */
+static void
+init_new_thread(struct thread *th, init_thread_data *scribble, int guardp)
{
- lispobj function;
- int result, lock_ret;
+ int lock_ret;
- FSHOW((stderr,"/creating thread %lu\n", thread_self()));
- check_deferrables_blocked_or_lose(0);
-#ifndef LISP_FEATURE_SB_SAFEPOINT
- check_gc_signals_unblocked_or_lose(0);
-#endif
pthread_setspecific(lisp_thread, (void *)1);
- function = th->no_tls_value_marker;
- th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG;
if(arch_os_thread_init(th)==0) {
/* FIXME: handle error */
lose("arch_os_thread_init failed\n");
}
th->os_thread=thread_self();
- protect_control_stack_guard_page(1, NULL);
+ if (guardp)
+ protect_control_stack_guard_page(1, NULL);
protect_binding_stack_guard_page(1, NULL);
protect_alien_stack_guard_page(1, NULL);
/* Since GC can only know about this thread from the all_threads
* danger of deadlocking even with SIG_STOP_FOR_GC blocked (which
* it is not). */
#ifdef LISP_FEATURE_SB_SAFEPOINT
- *th->csp_around_foreign_call = (lispobj)&function;
- pthread_mutex_lock(thread_qrl(th));
+ *th->csp_around_foreign_call = (lispobj)scribble;
#endif
lock_ret = pthread_mutex_lock(&all_threads_lock);
gc_assert(lock_ret == 0);
* non-safepoint versions of this code. Can we unify this more?
*/
#ifdef LISP_FEATURE_SB_SAFEPOINT
- WITH_GC_AT_SAFEPOINTS_ONLY() {
- result = funcall0(function);
- block_blockable_signals(0, 0);
- gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region);
- }
+ gc_state_lock();
+ gc_state_wait(GC_NONE);
+ gc_state_unlock();
+ push_gcing_safety(&scribble->safety);
+#endif
+}
+
+static void
+undo_init_new_thread(struct thread *th, init_thread_data *scribble)
+{
+ int lock_ret;
+
+ /* Kludge: Changed the order of some steps between the safepoint/
+ * non-safepoint versions of this code. Can we unify this more?
+ */
+#ifdef LISP_FEATURE_SB_SAFEPOINT
+ block_blockable_signals(0, 0);
+ gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region);
+#if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32)
+ gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->sprof_alloc_region);
+#endif
+ pop_gcing_safety(&scribble->safety);
lock_ret = pthread_mutex_lock(&all_threads_lock);
gc_assert(lock_ret == 0);
unlink_thread(th);
lock_ret = pthread_mutex_unlock(&all_threads_lock);
gc_assert(lock_ret == 0);
- pthread_mutex_unlock(thread_qrl(th));
- set_thread_state(th,STATE_DEAD);
#else
- result = funcall0(function);
-
/* Block GC */
block_blockable_signals(0, 0);
set_thread_state(th, STATE_DEAD);
gc_assert(lock_ret == 0);
gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region);
+#if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32)
+ gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->sprof_alloc_region);
+#endif
unlink_thread(th);
pthread_mutex_unlock(&all_threads_lock);
gc_assert(lock_ret == 0);
#endif
if(th->tls_cookie>=0) arch_os_thread_cleanup(th);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
os_sem_destroy(th->state_sem);
os_sem_destroy(th->state_not_running_sem);
os_sem_destroy(th->state_not_stopped_sem);
+#endif
+#if defined(LISP_FEATURE_WIN32)
+ free((os_vm_address_t)th->interrupt_data);
+#else
os_invalidate((os_vm_address_t)th->interrupt_data,
(sizeof (struct interrupt_data)));
+#endif
#ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER
mach_lisp_thread_destroy(th);
#endif
+#if defined(LISP_FEATURE_WIN32)
+ int i;
+ for (i = 0; i<
+ (int) (sizeof(th->private_events.events)/
+ sizeof(th->private_events.events[0])); ++i) {
+ CloseHandle(th->private_events.events[i]);
+ }
+ TlsSetValue(OUR_TLS_INDEX,NULL);
+#endif
+
+ /* Undo the association of the current pthread to its `struct thread',
+ * such that we can call arch_os_get_current_thread() later in this
+ * thread and cleanly get back NULL. */
+#ifdef LISP_FEATURE_GCC_TLS
+ current_thread = NULL;
+#else
+ pthread_setspecific(specials, NULL);
+#endif
+
schedule_thread_post_mortem(th);
+}
+
+/* this is the first thing that runs in the child (which is why the
+ * silly calling convention). Basically it calls the user's requested
+ * lisp function after doing arch_os_thread_init and whatever other
+ * bookkeeping needs to be done
+ */
+int
+new_thread_trampoline(struct thread *th)
+{
+ int result;
+ init_thread_data scribble;
+
+ FSHOW((stderr,"/creating thread %lu\n", thread_self()));
+ check_deferrables_blocked_or_lose(0);
+#ifndef LISP_FEATURE_SB_SAFEPOINT
+ check_gc_signals_unblocked_or_lose(0);
+#endif
+
+ lispobj function = th->no_tls_value_marker;
+ th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG;
+ init_new_thread(th, &scribble, 1);
+ result = funcall0(function);
+ undo_init_new_thread(th, &scribble);
+
FSHOW((stderr,"/exiting thread %lu\n", thread_self()));
return result;
}
+# ifdef LISP_FEATURE_SB_SAFEPOINT
+static struct thread *create_thread_struct(lispobj);
+
+void
+attach_os_thread(init_thread_data *scribble)
+{
+ os_thread_t os = pthread_self();
+ odxprint(misc, "attach_os_thread: attaching to %p", os);
+
+ struct thread *th = create_thread_struct(NIL);
+ block_deferrable_signals(0, &scribble->oldset);
+ th->no_tls_value_marker = NO_TLS_VALUE_MARKER_WIDETAG;
+ /* We don't actually want a pthread_attr here, but rather than add
+ * `if's to the post-mostem, let's just keep that code happy by
+ * keeping it initialized: */
+ pthread_attr_init(th->os_attr);
+
+#ifndef LISP_FEATURE_WIN32
+ /* On windows, arch_os_thread_init will take care of finding the
+ * stack. */
+ pthread_attr_t attr;
+ int pthread_getattr_np(pthread_t, pthread_attr_t *);
+ pthread_getattr_np(os, &attr);
+ void *stack_addr;
+ size_t stack_size;
+ pthread_attr_getstack(&attr, &stack_addr, &stack_size);
+ th->control_stack_start = stack_addr;
+ th->control_stack_end = (void *) (((uintptr_t) stack_addr) + stack_size);
+#endif
+
+ init_new_thread(th, scribble, 0);
+
+ /* We will be calling into Lisp soon, and the functions being called
+ * recklessly ignore the comment in target-thread which says that we
+ * must be careful to not cause GC while initializing a new thread.
+ * Since we first need to create a fresh thread object, it's really
+ * tempting to just perform such unsafe allocation though. So let's
+ * at least try to suppress GC before consing, and hope that it
+ * works: */
+ bind_variable(GC_INHIBIT, T, th);
+
+ uword_t stacksize
+ = (uword_t) th->control_stack_end - (uword_t) th->control_stack_start;
+ odxprint(misc, "attach_os_thread: attached %p as %p (0x%lx bytes stack)",
+ os, th, (long) stacksize);
+}
+
+void
+detach_os_thread(init_thread_data *scribble)
+{
+ struct thread *th = arch_os_get_current_thread();
+ odxprint(misc, "detach_os_thread: detaching");
+
+ undo_init_new_thread(th, scribble);
+
+ odxprint(misc, "deattach_os_thread: detached");
+ pthread_setspecific(lisp_thread, (void *)0);
+ thread_sigmask(SIG_SETMASK, &scribble->oldset, 0);
+}
+# endif /* safepoint */
+
#endif /* LISP_FEATURE_SB_THREAD */
static void
free_thread_struct(struct thread *th)
{
+#if defined(LISP_FEATURE_WIN32)
+ if (th->interrupt_data) {
+ os_invalidate_free((os_vm_address_t) th->interrupt_data,
+ (sizeof (struct interrupt_data)));
+ }
+ os_invalidate_free((os_vm_address_t) th->os_address,
+ THREAD_STRUCT_SIZE);
+#else
if (th->interrupt_data)
os_invalidate((os_vm_address_t) th->interrupt_data,
(sizeof (struct interrupt_data)));
os_invalidate((os_vm_address_t) th->os_address,
THREAD_STRUCT_SIZE);
+#endif
}
#ifdef LISP_FEATURE_SB_THREAD
struct thread *th=0; /* subdue gcc */
void *spaces=0;
void *aligned_spaces=0;
-#ifdef LISP_FEATURE_SB_THREAD
+#if defined(LISP_FEATURE_SB_THREAD) || defined(LISP_FEATURE_WIN32)
unsigned int i;
#endif
return NULL;
/* Aligning up is safe as THREAD_STRUCT_SIZE has
* THREAD_ALIGNMENT_BYTES padding. */
- aligned_spaces = (void *)((((unsigned long)(char *)spaces)
+ aligned_spaces = (void *)((((uword_t)(char *)spaces)
+ THREAD_ALIGNMENT_BYTES-1)
- &~(unsigned long)(THREAD_ALIGNMENT_BYTES-1));
+ &~(uword_t)(THREAD_ALIGNMENT_BYTES-1));
void* csp_page=
(aligned_spaces+
thread_control_stack_size+
th->os_thread=0;
#ifdef LISP_FEATURE_SB_SAFEPOINT
+# ifdef LISP_FEATURE_WIN32
+ th->carried_base_pointer = 0;
+# endif
+# ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
th->pc_around_foreign_call = 0;
+# endif
th->csp_around_foreign_call = csp_page;
#endif
* separately */
th->os_attr=malloc(sizeof(pthread_attr_t));
th->nonpointer_data = nonpointer_data;
+# ifndef LISP_FEATURE_SB_SAFEPOINT
th->state_sem=&nonpointer_data->state_sem;
th->state_not_running_sem=&nonpointer_data->state_not_running_sem;
th->state_not_stopped_sem=&nonpointer_data->state_not_stopped_sem;
- th->state_not_running_waitcount = 0;
- th->state_not_stopped_waitcount = 0;
os_sem_init(th->state_sem, 1);
os_sem_init(th->state_not_running_sem, 0);
os_sem_init(th->state_not_stopped_sem, 0);
-# ifdef LISP_FEATURE_SB_SAFEPOINT
- pthread_mutex_init(thread_qrl(th), NULL);
# endif
+ th->state_not_running_waitcount = 0;
+ th->state_not_stopped_waitcount = 0;
#endif
th->state=STATE_RUNNING;
-#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
+#ifdef ALIEN_STACK_GROWS_DOWNWARD
th->alien_stack_pointer=((void *)th->alien_stack_start
+ ALIEN_STACK_SIZE-N_WORD_BYTES);
#else
#endif
#ifdef LISP_FEATURE_GENCGC
gc_set_region_empty(&th->alloc_region);
+# if defined(LISP_FEATURE_SB_SAFEPOINT_STRICTLY) && !defined(LISP_FEATURE_WIN32)
+ gc_set_region_empty(&th->sprof_alloc_region);
+# endif
#endif
#ifdef LISP_FEATURE_SB_THREAD
/* This parallels the same logic in globals.c for the
access_control_stack_pointer(th)=th->control_stack_start;
#endif
+#if defined(LISP_FEATURE_WIN32)
+ th->interrupt_data = (struct interrupt_data *)
+ calloc((sizeof (struct interrupt_data)),1);
+#else
th->interrupt_data = (struct interrupt_data *)
os_validate(0,(sizeof (struct interrupt_data)));
+#endif
if (!th->interrupt_data) {
free_thread_struct(th);
return 0;
}
th->interrupt_data->pending_handler = 0;
th->interrupt_data->gc_blocked_deferrables = 0;
-#ifdef LISP_FEATURE_PPC
+#ifdef GENCGC_IS_PRECISE
th->interrupt_data->allocation_trap_context = 0;
#endif
th->no_tls_value_marker=initial_function;
+#if defined(LISP_FEATURE_WIN32)
+ for (i = 0; i<sizeof(th->private_events.events)/
+ sizeof(th->private_events.events[0]); ++i) {
+ th->private_events.events[i] = CreateEvent(NULL,FALSE,FALSE,NULL);
+ }
+ th->synchronous_io_handle_and_flag = 0;
+#endif
th->stepping = NIL;
return th;
}
if((initcode = pthread_attr_init(th->os_attr)) ||
/* call_into_lisp_first_time switches the stack for the initial
* thread. For the others, we use this. */
+#if defined(LISP_FEATURE_WIN32)
+ (pthread_attr_setstacksize(th->os_attr, thread_control_stack_size)) ||
+#else
+# if defined(LISP_FEATURE_C_STACK_IS_CONTROL_STACK)
(pthread_attr_setstack(th->os_attr,th->control_stack_start,
thread_control_stack_size)) ||
+# else
+ (pthread_attr_setstack(th->os_attr,th->alien_stack_start,
+ ALIEN_STACK_SIZE)) ||
+# endif
+#endif
(retcode = pthread_create
(kid_tid,th->os_attr,(void *(*)(void *))new_thread_trampoline,th))) {
FSHOW_SIGNAL((stderr, "init = %d\n", initcode));
int
wake_thread(os_thread_t os_thread)
{
-#ifdef LISP_FEATURE_WIN32
-# define SIGPIPE 1
-#endif
-#if !defined(LISP_FEATURE_SB_THRUPTION) || defined(LISP_FEATURE_WIN32)
+#if defined(LISP_FEATURE_WIN32)
+ return kill_safely(os_thread, 1);
+#elif !defined(LISP_FEATURE_SB_THRUPTION)
return kill_safely(os_thread, SIGPIPE);
#else
return wake_thread_posix(os_thread);
* :SPECIALS), especially with s/10/100/ in both loops. */
if (os_thread == pthread_self()) {
pthread_kill(os_thread, signal);
+#ifdef LISP_FEATURE_WIN32
+ check_pending_thruptions(NULL);
+#endif
return 0;
}
int status = pthread_kill(os_thread, signal);
if (status)
lose("kill_safely: pthread_kill failed with %d\n", status);
+#if defined(LISP_FEATURE_WIN32) && defined(LISP_FEATURE_SB_THRUPTION)
+ wake_thread_win32(thread);
+#endif
break;
}
}
return 0;
else
return -1;
+#elif defined(LISP_FEATURE_WIN32)
+ return 0;
#else
int status;
if (os_thread != 0)
projects / sbcl.git / blobdiff