#include "runtime.h"
#include "validate.h" /* for BINDING_STACK_SIZE etc */
-#include "alloc.h"
#include "thread.h"
#include "arch.h"
#include "target-arch-os.h"
#include "genesis/cons.h"
#include "genesis/fdefn.h"
#include "interr.h" /* for lose() */
+#include "alloc.h"
#include "gc-internal.h"
#ifdef LISP_FEATURE_WIN32
#define LOCK_CREATE_THREAD
#endif
-#define ALIEN_STACK_SIZE (1*1024*1024) /* 1Mb size chosen at random */
-
#ifdef LISP_FEATURE_SB_THREAD
struct thread_post_mortem {
#ifdef DELAY_THREAD_POST_MORTEM
#ifdef LISP_FEATURE_GCC_TLS
__thread struct thread *current_thread;
#endif
+pthread_key_t lisp_thread = 0;
#endif
#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
if (th->next)
th->next->prev = th->prev;
}
+
+/* Only access thread state with blockables blocked. */
+lispobj
+thread_state(struct thread *thread)
+{
+ lispobj state;
+ sigset_t old;
+ block_blockable_signals(NULL, &old);
+ os_sem_wait(thread->state_sem, "thread_state");
+ state = thread->state;
+ os_sem_post(thread->state_sem, "thread_state");
+ thread_sigmask(SIG_SETMASK, &old, NULL);
+ return state;
+}
+
+void
+set_thread_state(struct thread *thread, lispobj state)
+{
+ int i, waitcount = 0;
+ sigset_t old;
+ block_blockable_signals(NULL, &old);
+ os_sem_wait(thread->state_sem, "set_thread_state");
+ if (thread->state != state) {
+ if ((STATE_STOPPED==state) ||
+ (STATE_DEAD==state)) {
+ waitcount = thread->state_not_running_waitcount;
+ thread->state_not_running_waitcount = 0;
+ for (i=0; i<waitcount; i++)
+ os_sem_post(thread->state_not_running_sem, "set_thread_state (not running)");
+ }
+ if ((STATE_RUNNING==state) ||
+ (STATE_DEAD==state)) {
+ waitcount = thread->state_not_stopped_waitcount;
+ thread->state_not_stopped_waitcount = 0;
+ for (i=0; i<waitcount; i++)
+ os_sem_post(thread->state_not_stopped_sem, "set_thread_state (not stopped)");
+ }
+ thread->state = state;
+ }
+ os_sem_post(thread->state_sem, "set_thread_state");
+ thread_sigmask(SIG_SETMASK, &old, NULL);
+}
+
+void
+wait_for_thread_state_change(struct thread *thread, lispobj state)
+{
+ sigset_t old;
+ os_sem_t *wait_sem;
+ block_blockable_signals(NULL, &old);
+ start:
+ os_sem_wait(thread->state_sem, "wait_for_thread_state_change");
+ if (thread->state == state) {
+ switch (state) {
+ case STATE_RUNNING:
+ wait_sem = thread->state_not_running_sem;
+ thread->state_not_running_waitcount++;
+ break;
+ case STATE_STOPPED:
+ wait_sem = thread->state_not_stopped_sem;
+ thread->state_not_stopped_waitcount++;
+ break;
+ default:
+ lose("Invalid state in wait_for_thread_state_change: "OBJ_FMTX"\n", state);
+ }
+ } else {
+ wait_sem = NULL;
+ }
+ os_sem_post(thread->state_sem, "wait_for_thread_state_change");
+ if (wait_sem) {
+ os_sem_wait(wait_sem, "wait_for_thread_state_change");
+ goto start;
+ }
+ thread_sigmask(SIG_SETMASK, &old, NULL);
+}
#endif
static int
#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
lispobj *args = NULL;
#endif
+#ifdef LISP_FEATURE_SB_THREAD
+ pthread_setspecific(lisp_thread, (void *)1);
+#endif
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_PPC)
+ /* SIG_STOP_FOR_GC defaults to blocked on PPC? */
+ unblock_gc_signals(0,0);
+#endif
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;
link_thread(th);
th->os_thread=thread_self();
#ifndef LISP_FEATURE_WIN32
- protect_control_stack_guard_page(1);
+ protect_control_stack_hard_guard_page(1, NULL);
+ protect_binding_stack_hard_guard_page(1, NULL);
+ protect_alien_stack_hard_guard_page(1, NULL);
+ protect_control_stack_guard_page(1, NULL);
+ 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)
#ifdef LISP_FEATURE_SB_THREAD
#define THREAD_STATE_LOCK_SIZE \
- (sizeof(pthread_mutex_t))+(sizeof(pthread_cond_t))
+ ((sizeof(os_sem_t))+(sizeof(os_sem_t))+(sizeof(os_sem_t)))
#else
#define THREAD_STATE_LOCK_SIZE 0
#endif
int result, lock_ret;
FSHOW((stderr,"/creating thread %lu\n", thread_self()));
- check_deferrables_blocked_or_lose();
- check_gc_signals_unblocked_or_lose();
+ check_deferrables_blocked_or_lose(0);
+ check_gc_signals_unblocked_or_lose(0);
+ 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) {
}
th->os_thread=thread_self();
- protect_control_stack_guard_page(1);
+ 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
* list and we're just adding this thread to it, there is no
* danger of deadlocking even with SIG_STOP_FOR_GC blocked (which
result = funcall0(function);
/* Block GC */
- block_blockable_signals();
+ block_blockable_signals(0, 0);
set_thread_state(th, STATE_DEAD);
/* SIG_STOP_FOR_GC is blocked and GC might be waiting for this
gc_assert(lock_ret == 0);
if(th->tls_cookie>=0) arch_os_thread_cleanup(th);
- pthread_mutex_destroy(th->state_lock);
- pthread_cond_destroy(th->state_cond);
+ os_sem_destroy(th->state_sem);
+ os_sem_destroy(th->state_not_running_sem);
+ os_sem_destroy(th->state_not_stopped_sem);
os_invalidate((os_vm_address_t)th->interrupt_data,
(sizeof (struct interrupt_data)));
#ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER
FSHOW((stderr, "Deallocating mach port %x\n", THREAD_STRUCT_TO_EXCEPTION_PORT(th)));
- mach_port_move_member(mach_task_self(),
+ mach_port_move_member(current_mach_task,
THREAD_STRUCT_TO_EXCEPTION_PORT(th),
MACH_PORT_NULL);
- mach_port_deallocate(mach_task_self(),
+ mach_port_deallocate(current_mach_task,
THREAD_STRUCT_TO_EXCEPTION_PORT(th));
- mach_port_destroy(mach_task_self(),
+ mach_port_destroy(current_mach_task,
THREAD_STRUCT_TO_EXCEPTION_PORT(th));
#endif
THREAD_STRUCT_SIZE);
}
+#ifdef LISP_FEATURE_SB_THREAD
+/* FIXME: should be MAX_INTERRUPTS -1 ? */
+const unsigned int tls_index_start =
+ MAX_INTERRUPTS + sizeof(struct thread)/sizeof(lispobj);
+#endif
+
/* this is called from any other thread to create the new one, and
* initialize all parts of it that can be initialized from another
* thread
per_thread->dynamic_values[i] = NO_TLS_VALUE_MARKER_WIDETAG;
if (all_threads == 0) {
if(SymbolValue(FREE_TLS_INDEX,0)==UNBOUND_MARKER_WIDETAG) {
- SetSymbolValue
- (FREE_TLS_INDEX,
- /* FIXME: should be MAX_INTERRUPTS -1 ? */
- make_fixnum(MAX_INTERRUPTS+
- sizeof(struct thread)/sizeof(lispobj)),
- 0);
+ SetSymbolValue(FREE_TLS_INDEX,tls_index_start << WORD_SHIFT,0);
SetSymbolValue(TLS_INDEX_LOCK,make_fixnum(0),0);
}
#define STATIC_TLS_INIT(sym,field) \
((struct symbol *)(sym-OTHER_POINTER_LOWTAG))->tls_index= \
- make_fixnum(THREAD_SLOT_OFFSET_WORDS(field))
+ (THREAD_SLOT_OFFSET_WORDS(field) << WORD_SHIFT)
STATIC_TLS_INIT(BINDING_STACK_START,binding_stack_start);
+#ifdef BINDING_STACK_POINTER
STATIC_TLS_INIT(BINDING_STACK_POINTER,binding_stack_pointer);
+#endif
STATIC_TLS_INIT(CONTROL_STACK_START,control_stack_start);
STATIC_TLS_INIT(CONTROL_STACK_END,control_stack_end);
+#ifdef ALIEN_STACK
STATIC_TLS_INIT(ALIEN_STACK,alien_stack_pointer);
+#endif
#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
STATIC_TLS_INIT(PSEUDO_ATOMIC_BITS,pseudo_atomic_bits);
#endif
th->binding_stack_start=
(lispobj*)((void*)th->control_stack_start+thread_control_stack_size);
th->control_stack_end = th->binding_stack_start;
+ th->control_stack_guard_page_protected = T;
th->alien_stack_start=
(lispobj*)((void*)th->binding_stack_start+BINDING_STACK_SIZE);
- th->binding_stack_pointer=th->binding_stack_start;
+ set_binding_stack_pointer(th,th->binding_stack_start);
th->this=th;
th->os_thread=0;
#ifdef LISP_FEATURE_SB_THREAD
th->os_attr=malloc(sizeof(pthread_attr_t));
- th->state_lock=(pthread_mutex_t *)((void *)th->alien_stack_start +
- ALIEN_STACK_SIZE);
- pthread_mutex_init(th->state_lock, NULL);
- th->state_cond=(pthread_cond_t *)((void *)th->state_lock +
- (sizeof(pthread_mutex_t)));
- pthread_cond_init(th->state_cond, NULL);
+ th->state_sem=(os_sem_t *)((void *)th->alien_stack_start + ALIEN_STACK_SIZE);
+ th->state_not_running_sem=(os_sem_t *)
+ ((void *)th->state_sem + (sizeof(os_sem_t)));
+ th->state_not_stopped_sem=(os_sem_t *)
+ ((void *)th->state_not_running_sem + (sizeof(os_sem_t)));
+ 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);
#endif
th->state=STATE_RUNNING;
#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
#else
th->alien_stack_pointer=((void *)th->alien_stack_start);
#endif
-#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
+#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64) || defined(LISP_FEATURE_SB_THREAD)
th->pseudo_atomic_bits=0;
#endif
#ifdef LISP_FEATURE_GENCGC
gc_set_region_empty(&th->alloc_region);
#endif
+#ifdef LISP_FEATURE_SB_THREAD
+ /* This parallels the same logic in globals.c for the
+ * single-threaded foreign_function_call_active, KLUDGE and
+ * all. */
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+ th->foreign_function_call_active = 0;
+#else
+ th->foreign_function_call_active = 1;
+#endif
+#endif
#ifndef LISP_FEATURE_SB_THREAD
/* the tls-points-into-struct-thread trick is only good for threaded
SetSymbolValue(CONTROL_STACK_START,(lispobj)th->control_stack_start,th);
SetSymbolValue(CONTROL_STACK_END,(lispobj)th->control_stack_end,th);
#if defined(LISP_FEATURE_X86) || defined (LISP_FEATURE_X86_64)
- SetSymbolValue(BINDING_STACK_POINTER,(lispobj)th->binding_stack_pointer,th);
SetSymbolValue(ALIEN_STACK,(lispobj)th->alien_stack_pointer,th);
SetSymbolValue(PSEUDO_ATOMIC_BITS,(lispobj)th->pseudo_atomic_bits,th);
-#else
- current_binding_stack_pointer=th->binding_stack_pointer;
- current_control_stack_pointer=th->control_stack_start;
#endif
#endif
bind_variable(CURRENT_CATCH_BLOCK,make_fixnum(0),th);
bind_variable(ALLOW_WITH_INTERRUPTS,T,th);
bind_variable(GC_PENDING,NIL,th);
bind_variable(ALLOC_SIGNAL,NIL,th);
+#ifdef PINNED_OBJECTS
+ bind_variable(PINNED_OBJECTS,NIL,th);
+#endif
#ifdef LISP_FEATURE_SB_THREAD
bind_variable(STOP_FOR_GC_PENDING,NIL,th);
#endif
+#ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
+ access_control_stack_pointer(th)=th->control_stack_start;
+#endif
th->interrupt_data = (struct interrupt_data *)
os_validate(0,(sizeof (struct interrupt_data)));
}
th->interrupt_data->pending_handler = 0;
th->interrupt_data->gc_blocked_deferrables = 0;
+#ifdef LISP_FEATURE_PPC
+ th->interrupt_data->allocation_trap_context = 0;
+#endif
th->no_tls_value_marker=initial_function;
th->stepping = NIL;
void create_initial_thread(lispobj initial_function) {
struct thread *th=create_thread_struct(initial_function);
- if(th) {
-#ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER
- setup_mach_exception_handling_thread();
+#ifdef LISP_FEATURE_SB_THREAD
+ pthread_key_create(&lisp_thread, 0);
#endif
+ if(th) {
initial_thread_trampoline(th); /* no return */
} else lose("can't create initial thread\n");
}
/* Blocking deferrable signals is enough, no need to block
* SIG_STOP_FOR_GC because the child process is not linked onto
* all_threads until it's ready. */
- thread_sigmask(SIG_BLOCK, &deferrable_sigset, &oldset);
+ block_deferrable_signals(0, &oldset);
#ifdef LOCK_CREATE_THREAD
retcode = pthread_mutex_lock(&create_thread_lock);
#endif
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. */
- (pthread_attr_setstack(th->os_attr,th->control_stack_start,thread_control_stack_size)) ||
+ /* call_into_lisp_first_time switches the stack for the initial
+ * thread. For the others, we use this. */
+ (pthread_attr_setstack(th->os_attr,th->control_stack_start,
+ thread_control_stack_size)) ||
(retcode = pthread_create
(kid_tid,th->os_attr,(void *(*)(void *))new_thread_trampoline,th))) {
FSHOW_SIGNAL((stderr, "init = %d\n", initcode));
- FSHOW_SIGNAL((stderr, printf("pthread_create returned %d, errno %d\n", retcode, errno)));
+ FSHOW_SIGNAL((stderr, "pthread_create returned %d, errno %d\n",
+ retcode, errno));
if(retcode < 0) {
perror("create_os_thread");
}
/* Must defend against async unwinds. */
if (SymbolValue(INTERRUPTS_ENABLED, thread) != NIL)
lose("create_thread is not safe when interrupts are enabled.\n");
-
+
/* Assuming that a fresh thread struct has no lisp objects in it,
* linking it to all_threads can be left to the thread itself
* without fear of gc lossage. initial_function violates this
if (p!=th) {
lispobj state = thread_state(p);
if (state != STATE_DEAD) {
- if(state != STATE_SUSPENDED) {
+ if(state != STATE_STOPPED) {
lose("gc_start_the_world: wrong thread state is %d\n",
fixnum_value(state));
}
int
kill_safely(os_thread_t os_thread, int signal)
{
+ FSHOW_SIGNAL((stderr,"/kill_safely: %lu, %d\n", os_thread, signal));
+ {
#ifdef LISP_FEATURE_SB_THREAD
- sigset_t oldset;
- struct thread *thread;
- /* pthread_kill is not async signal safe and we don't want to be
- * interrupted while holding the lock. */
- thread_sigmask(SIG_BLOCK, &deferrable_sigset, &oldset);
- pthread_mutex_lock(&all_threads_lock);
- for (thread = all_threads; thread; thread = thread->next) {
- if (thread->os_thread == os_thread) {
- int status = pthread_kill(os_thread, signal);
- if (status)
- lose("kill_safely: pthread_kill failed with %d\n", status);
- break;
+ sigset_t oldset;
+ struct thread *thread;
+ /* pthread_kill is not async signal safe and we don't want to be
+ * interrupted while holding the lock. */
+ block_deferrable_signals(0, &oldset);
+ pthread_mutex_lock(&all_threads_lock);
+ for (thread = all_threads; thread; thread = thread->next) {
+ if (thread->os_thread == os_thread) {
+ int status = pthread_kill(os_thread, signal);
+ if (status)
+ lose("kill_safely: pthread_kill failed with %d\n", status);
+ break;
+ }
}
- }
- pthread_mutex_unlock(&all_threads_lock);
- thread_sigmask(SIG_SETMASK,&oldset,0);
- if (thread)
- return 0;
- else
- return -1;
+ pthread_mutex_unlock(&all_threads_lock);
+ thread_sigmask(SIG_SETMASK,&oldset,0);
+ if (thread)
+ return 0;
+ else
+ return -1;
#else
- int status;
- if (os_thread != 0)
- lose("kill_safely: who do you want to kill? %d?\n", os_thread);
- status = raise(signal);
- if (status == 0) {
- return 0;
- } else {
- lose("cannot raise signal %d, %d %s\n",
- signal, status, strerror(errno));
- }
+ int status;
+ if (os_thread != 0)
+ lose("kill_safely: who do you want to kill? %d?\n", os_thread);
+ /* Dubious (as in don't know why it works) workaround for the
+ * signal sometimes not being generated on darwin. */
+#ifdef LISP_FEATURE_DARWIN
+ {
+ sigset_t oldset;
+ sigprocmask(SIG_BLOCK, &deferrable_sigset, &oldset);
+ status = raise(signal);
+ sigprocmask(SIG_SETMASK,&oldset,0);
+ }
+#else
+ status = raise(signal);
#endif
+ if (status == 0) {
+ return 0;
+ } else {
+ lose("cannot raise signal %d, %d %s\n",
+ signal, status, strerror(errno));
+ }
+#endif
+ }
}
projects / sbcl.git / blobdiff