#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
# endif /* !IMMEDIATE_POST_MORTEM */
-/* 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)
+static void
+init_new_thread(struct thread *th, init_thread_data *scribble)
{
- 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");
* 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)&lock_ret;
#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);
+ 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);
#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);
#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);
+ result = funcall0(function);
+ undo_init_new_thread(th, &scribble);
+
FSHOW((stderr,"/exiting thread %lu\n", thread_self()));
return result;
}
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
projects / sbcl.git / blobdiff