#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
struct thread_post_mortem *next;
os_vm_address_t os_address;
};
-
#ifdef DELAY_THREAD_POST_MORTEM
static int pending_thread_post_mortem_count = 0;
pthread_mutex_t thread_post_mortem_lock = PTHREAD_MUTEX_INITIALIZER;
#endif
static struct thread_post_mortem * volatile pending_thread_post_mortem = 0;
+#endif
int dynamic_values_bytes=TLS_SIZE*sizeof(lispobj); /* same for all threads */
-struct thread * volatile all_threads;
+struct thread *all_threads;
extern struct interrupt_data * global_interrupt_data;
#ifdef LISP_FEATURE_SB_THREAD
#endif
}
+#ifdef LISP_FEATURE_SB_THREAD
+#define THREAD_STATE_LOCK_SIZE \
+ (sizeof(pthread_mutex_t))+(sizeof(pthread_cond_t))
+#else
+#define THREAD_STATE_LOCK_SIZE 0
+#endif
+
#define THREAD_STRUCT_SIZE (thread_control_stack_size + BINDING_STACK_SIZE + \
- ALIEN_STACK_SIZE + dynamic_values_bytes + \
+ ALIEN_STACK_SIZE + \
+ THREAD_STATE_LOCK_SIZE + \
+ dynamic_values_bytes + \
32 * SIGSTKSZ + \
THREAD_ALIGNMENT_BYTES)
/* Block GC */
block_blockable_signals();
- th->state=STATE_DEAD;
+ set_thread_state(th, STATE_DEAD);
/* SIG_STOP_FOR_GC is blocked and GC might be waiting for this
* thread, but since we are already dead it won't wait long. */
lock_ret = pthread_mutex_lock(&all_threads_lock);
gc_assert(lock_ret == 0);
- gc_alloc_update_page_tables(0, &th->alloc_region);
+ gc_alloc_update_page_tables(BOXED_PAGE_FLAG, &th->alloc_region);
unlink_thread(th);
pthread_mutex_unlock(&all_threads_lock);
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_invalidate((os_vm_address_t)th->interrupt_data,
(sizeof (struct interrupt_data)));
#endif
schedule_thread_post_mortem(th);
- FSHOW((stderr,"/exiting thread %p\n", thread_self()));
+ FSHOW((stderr,"/exiting thread %lu\n", thread_self()));
return result;
}
(aligned_spaces+
thread_control_stack_size+
BINDING_STACK_SIZE+
- ALIEN_STACK_SIZE);
+ ALIEN_STACK_SIZE +
+ THREAD_STATE_LOCK_SIZE);
#ifdef LISP_FEATURE_SB_THREAD
for(i = 0; i < (dynamic_values_bytes / sizeof(lispobj)); i++)
th->binding_stack_pointer=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);
+#endif
th->state=STATE_RUNNING;
#ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD
th->alien_stack_pointer=((void *)th->alien_stack_start
bind_variable(INTERRUPTS_ENABLED,T,th);
bind_variable(ALLOW_WITH_INTERRUPTS,T,th);
bind_variable(GC_PENDING,NIL,th);
+ bind_variable(ALLOC_SIGNAL,NIL,th);
#ifdef LISP_FEATURE_SB_THREAD
bind_variable(STOP_FOR_GC_PENDING,NIL,th);
#endif
(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, "wanted stack size %d, min stack size %d\n",
- cstack_size, PTHREAD_STACK_MIN));
if(retcode < 0) {
perror("create_os_thread");
}
int signal_interrupt_thread(os_thread_t os_thread)
{
int status = kill_thread_safely(os_thread, SIG_INTERRUPT_THREAD);
+ FSHOW_SIGNAL((stderr,"/signal_interrupt_thread: %lu\n", os_thread));
if (status == 0) {
return 0;
} else if (status == ESRCH) {
#ifdef LOCK_CREATE_THREAD
/* KLUDGE: Stopping the thread during pthread_create() causes deadlock
* on FreeBSD. */
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world:waiting on create_thread_lock, thread=%lu\n",
- th->os_thread));
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world:waiting on create_thread_lock\n"));
lock_ret = pthread_mutex_lock(&create_thread_lock);
gc_assert(lock_ret == 0);
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world:got create_thread_lock, thread=%lu\n",
- th->os_thread));
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world:got create_thread_lock\n"));
#endif
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world:waiting on lock, thread=%lu\n",
- th->os_thread));
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world:waiting on lock\n"));
/* keep threads from starting while the world is stopped. */
lock_ret = pthread_mutex_lock(&all_threads_lock); \
gc_assert(lock_ret == 0);
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world:got lock, thread=%lu\n",
- th->os_thread));
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world:got lock\n"));
/* stop all other threads by sending them SIG_STOP_FOR_GC */
for(p=all_threads; p; p=p->next) {
gc_assert(p->os_thread != 0);
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world: p->state: %x\n", p->state));
- if((p!=th) && ((p->state==STATE_RUNNING))) {
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world: suspending %x, os_thread %x\n",
- p, p->os_thread));
- status=kill_thread_safely(p->os_thread,SIG_STOP_FOR_GC);
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world: thread=%lu, state=%x\n",
+ p->os_thread, thread_state(p)));
+ if((p!=th) && ((thread_state(p)==STATE_RUNNING))) {
+ FSHOW_SIGNAL((stderr,"/gc_stop_the_world: suspending thread %lu\n",
+ p->os_thread));
+ status=pthread_kill(p->os_thread,SIG_STOP_FOR_GC);
if (status==ESRCH) {
/* This thread has exited. */
- gc_assert(p->state==STATE_DEAD);
+ gc_assert(thread_state(p)==STATE_DEAD);
} else if (status) {
lose("cannot send suspend thread=%lu: %d, %s\n",
p->os_thread,status,strerror(status));
}
}
FSHOW_SIGNAL((stderr,"/gc_stop_the_world:signals sent\n"));
- /* wait for the running threads to stop or finish */
- for(p=all_threads;p;) {
- FSHOW_SIGNAL((stderr,"/gc_stop_the_world: th: %p, p: %p\n", th, p));
- if((p!=th) && (p->state==STATE_RUNNING)) {
- sched_yield();
- } else {
- p=p->next;
+ for(p=all_threads;p;p=p->next) {
+ if (p!=th) {
+ FSHOW_SIGNAL
+ ((stderr,
+ "/gc_stop_the_world: waiting for thread=%lu: state=%x\n",
+ p->os_thread, thread_state(p)));
+ wait_for_thread_state_change(p, STATE_RUNNING);
+ if (p->state == STATE_RUNNING)
+ lose("/gc_stop_the_world: unexpected state");
}
}
FSHOW_SIGNAL((stderr,"/gc_stop_the_world:end\n"));
void gc_start_the_world()
{
struct thread *p,*th=arch_os_get_current_thread();
- int status, lock_ret;
+ int lock_ret;
/* if a resumed thread creates a new thread before we're done with
* this loop, the new thread will get consed on the front of
* all_threads, but it won't have been stopped so won't need
FSHOW_SIGNAL((stderr,"/gc_start_the_world:begin\n"));
for(p=all_threads;p;p=p->next) {
gc_assert(p->os_thread!=0);
- if((p!=th) && (p->state!=STATE_DEAD)) {
- if(p->state!=STATE_SUSPENDED) {
- lose("gc_start_the_world: wrong thread state is %d\n",
- fixnum_value(p->state));
- }
- FSHOW_SIGNAL((stderr, "/gc_start_the_world: resuming %lu\n",
- p->os_thread));
- p->state=STATE_RUNNING;
-
-#if defined(SIG_RESUME_FROM_GC)
- status=kill_thread_safely(p->os_thread,SIG_RESUME_FROM_GC);
-#else
- status=kill_thread_safely(p->os_thread,SIG_STOP_FOR_GC);
-#endif
- if (status) {
- lose("cannot resume thread=%lu: %d, %s\n",
- p->os_thread,status,strerror(status));
+ if (p!=th) {
+ lispobj state = thread_state(p);
+ if (state != STATE_DEAD) {
+ if(state != STATE_SUSPENDED) {
+ lose("gc_start_the_world: wrong thread state is %d\n",
+ fixnum_value(state));
+ }
+ FSHOW_SIGNAL((stderr, "/gc_start_the_world: resuming %lu\n",
+ p->os_thread));
+ set_thread_state(p, STATE_RUNNING);
}
}
}
- /* If we waited here until all threads leave STATE_SUSPENDED, then
- * SIG_STOP_FOR_GC wouldn't need to be a rt signal. That has some
- * performance implications, but does away with the 'rt signal
- * queue full' problem. */
lock_ret = pthread_mutex_unlock(&all_threads_lock);
gc_assert(lock_ret == 0);
projects / sbcl.git / blobdiff