projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.1.59:
[sbcl.git]
/
src
/
runtime
/
thread.h
diff --git
a/src/runtime/thread.h
b/src/runtime/thread.h
index
e9039a1
..
870411c
100644
(file)
--- a/
src/runtime/thread.h
+++ b/
src/runtime/thread.h
@@
-5,8
+5,8
@@
#include <sys/types.h>
#include <unistd.h>
#include <stddef.h>
#include <sys/types.h>
#include <unistd.h>
#include <stddef.h>
-#include "runtime.h"
#include "sbcl.h"
#include "sbcl.h"
+#include "runtime.h"
#include "os.h"
#include "interrupt.h"
#ifdef LISP_FEATURE_GENCGC
#include "os.h"
#include "interrupt.h"
#ifdef LISP_FEATURE_GENCGC
@@
-21,6
+21,8
@@
struct alloc_region { };
#define STATE_RUNNING (make_fixnum(0))
#define STATE_STOPPING (make_fixnum(1))
#define STATE_STOPPED (make_fixnum(2))
#define STATE_RUNNING (make_fixnum(0))
#define STATE_STOPPING (make_fixnum(1))
#define STATE_STOPPED (make_fixnum(2))
+#define STATE_DEAD (make_fixnum(3))
+#define STATE_STARTING (make_fixnum(4))
#define THREAD_SLOT_OFFSET_WORDS(c) \
(offsetof(struct thread,c)/(sizeof (struct thread *)))
#define THREAD_SLOT_OFFSET_WORDS(c) \
(offsetof(struct thread,c)/(sizeof (struct thread *)))
@@
-32,7
+34,7
@@
union per_thread_data {
extern struct thread *all_threads;
extern int dynamic_values_bytes;
extern struct thread *all_threads;
extern int dynamic_values_bytes;
-extern struct thread *find_thread_by_pid(pid_t pid);
+extern struct thread *find_thread_by_os_thread(os_thread_t tid);
#ifdef LISP_FEATURE_SB_THREAD
#define for_each_thread(th) for(th=all_threads;th;th=th->next)
#ifdef LISP_FEATURE_SB_THREAD
#define for_each_thread(th) for(th=all_threads;th;th=th->next)
@@
-42,7
+44,7
@@
extern struct thread *find_thread_by_pid(pid_t pid);
#define for_each_thread(th) for(th=all_threads;th;th=0)
#endif
#define for_each_thread(th) for(th=all_threads;th;th=0)
#endif
-static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolValue(u64 tagged_symbol_pointer, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-55,7
+57,7
@@
static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
#endif
return sym->value;
}
#endif
return sym->value;
}
-static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolTlValue(u64 tagged_symbol_pointer, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-66,7
+68,7
@@
static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
#endif
}
#endif
}
-static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-81,7
+83,7
@@
static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *t
#endif
sym->value = val;
}
#endif
sym->value = val;
}
-static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
@@
-104,20
+106,32
@@
static inline os_context_t *get_interrupt_context_for_thread(struct thread *th)
* much stuff like struct thread and all_threads to be defined, which
* usually aren't by that time. So, it's here instead. Sorry */
* much stuff like struct thread and all_threads to be defined, which
* usually aren't by that time. So, it's here instead. Sorry */
-inline static struct thread *arch_os_get_current_thread() {
-#if defined(LISP_FEATURE_SB_THREAD) && defined (LISP_FEATURE_X86)
+static inline struct thread *arch_os_get_current_thread() {
+#if defined(LISP_FEATURE_SB_THREAD)
+#if defined(LISP_FEATURE_X86)
register struct thread *me=0;
if(all_threads)
__asm__ __volatile__ ("movl %%fs:%c1,%0" : "=r" (me)
: "i" (offsetof (struct thread,this)));
return me;
#else
register struct thread *me=0;
if(all_threads)
__asm__ __volatile__ ("movl %%fs:%c1,%0" : "=r" (me)
: "i" (offsetof (struct thread,this)));
return me;
#else
- return all_threads;
+ return pthread_getspecific(specials);
+#endif /* x86 */
+#else
+ return all_threads;
#endif
}
#endif
}
+#if defined(LISP_FEATURE_SB_THREAD)
+#define thread_self pthread_self
+#define thread_kill pthread_kill
+#define thread_sigmask pthread_sigmask
+#else
+#define thread_self getpid
+#define thread_kill kill
+#define thread_sigmask sigprocmask
+#endif
-int arch_os_thread_init(struct thread *thread);
-extern struct thread *arch_os_get_current_thread();
+extern void create_initial_thread(lispobj);
#endif /* _INCLUDE_THREAD_H_ */
#endif /* _INCLUDE_THREAD_H_ */