projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.2.31:
[sbcl.git]
/
src
/
runtime
/
thread.h
diff --git
a/src/runtime/thread.h
b/src/runtime/thread.h
index
499a02c
..
e1cabcd
100644
(file)
--- a/
src/runtime/thread.h
+++ b/
src/runtime/thread.h
@@
-1,4
+1,3
@@
-
#if !defined(_INCLUDE_THREAD_H_)
#define _INCLUDE_THREAD_H_
#if !defined(_INCLUDE_THREAD_H_)
#define _INCLUDE_THREAD_H_
@@
-6,6
+5,7
@@
#include <unistd.h>
#include <stddef.h>
#include "sbcl.h"
#include <unistd.h>
#include <stddef.h>
#include "sbcl.h"
+#include "globals.h"
#include "runtime.h"
#include "os.h"
#include "interrupt.h"
#include "runtime.h"
#include "os.h"
#include "interrupt.h"
@@
-18,11
+18,10
@@
struct alloc_region { };
#include "genesis/static-symbols.h"
#include "genesis/thread.h"
#include "genesis/static-symbols.h"
#include "genesis/thread.h"
-#define STATE_RUNNING (make_fixnum(0))
-#define STATE_STOPPING (make_fixnum(1))
-#define STATE_STOPPED (make_fixnum(2))
+#define STATE_STARTING (make_fixnum(0))
+#define STATE_RUNNING (make_fixnum(1))
+#define STATE_SUSPENDED (make_fixnum(2))
#define STATE_DEAD (make_fixnum(3))
#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 *)))
@@
-34,7
+33,6
@@
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);
#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)
@@
-107,19
+105,31
@@
static inline os_context_t *get_interrupt_context_for_thread(struct thread *th)
* usually aren't by that time. So, it's here instead. Sorry */
static inline struct thread *arch_os_get_current_thread() {
* usually aren't by that time. So, it's here instead. Sorry */
static inline struct thread *arch_os_get_current_thread() {
-#if defined(LISP_FEATURE_SB_THREAD) && defined (LISP_FEATURE_X86)
+#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 void create_initial_thread(lispobj);
#endif /* _INCLUDE_THREAD_H_ */
extern void create_initial_thread(lispobj);
#endif /* _INCLUDE_THREAD_H_ */