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.18: various error &co reporting improvements and build tweaks
[sbcl.git]
/
src
/
runtime
/
x86-linux-os.c
diff --git
a/src/runtime/x86-linux-os.c
b/src/runtime/x86-linux-os.c
index
7d42968
..
4b4f9ff
100644
(file)
--- a/
src/runtime/x86-linux-os.c
+++ b/
src/runtime/x86-linux-os.c
@@
-22,6
+22,7
@@
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
+#include "sbcl.h"
#include "./signal.h"
#include "os.h"
#include "arch.h"
#include "./signal.h"
#include "os.h"
#include "arch.h"
@@
-29,7
+30,6
@@
#include "interrupt.h"
#include "interr.h"
#include "lispregs.h"
#include "interrupt.h"
#include "interr.h"
#include "lispregs.h"
-#include "sbcl.h"
#include <sys/socket.h>
#include <sys/utsname.h>
#include <sys/socket.h>
#include <sys/utsname.h>
@@
-42,8
+42,13
@@
#include <asm/ldt.h>
#include <linux/unistd.h>
#include <sys/mman.h>
#include <asm/ldt.h>
#include <linux/unistd.h>
#include <sys/mman.h>
+#include <linux/version.h>
#include "thread.h" /* dynamic_values_bytes */
#include "thread.h" /* dynamic_values_bytes */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#define user_desc modify_ldt_ldt_s
+#endif
+
_syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
#include "validate.h"
_syscall3(int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount );
#include "validate.h"
@@
-60,20
+65,20
@@
void debug_get_ldt()
printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
}
printf("%d bytes in ldt: print/x local_ldt_copy\n", n);
}
-lispobj modify_ldt_lock; /* protect all calls to modify_ldt */
+volatile lispobj modify_ldt_lock; /* protect all calls to modify_ldt */
int arch_os_thread_init(struct thread *thread) {
stack_t sigstack;
#ifdef LISP_FEATURE_SB_THREAD
int arch_os_thread_init(struct thread *thread) {
stack_t sigstack;
#ifdef LISP_FEATURE_SB_THREAD
- /* this must be called from a function that has an exclusive lock
- * on all_threads
+ /* FIXME Lock ordering rules: all_threads_lock must usually be
+ * held when getting modify_ldt_lock
*/
*/
- struct modify_ldt_ldt_s ldt_entry = {
+ struct user_desc ldt_entry = {
1, 0, 0, /* index, address, length filled in later */
1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
};
int n;
1, 0, 0, /* index, address, length filled in later */
1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
};
int n;
- get_spinlock(&modify_ldt_lock,thread);
+ get_spinlock(&modify_ldt_lock,(long)thread);
n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy);
/* get next free ldt entry */
n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy);
/* get next free ldt entry */
@@
-99,6
+104,7
@@
int arch_os_thread_init(struct thread *thread) {
modify_ldt_lock=0;
if(n<0) return 0;
modify_ldt_lock=0;
if(n<0) return 0;
+ pthread_setspecific(specials,thread);
#endif
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
/* Signal handlers are run on the control stack, so if it is exhausted
#endif
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
/* Signal handlers are run on the control stack, so if it is exhausted
@@
-108,6
+114,9
@@
int arch_os_thread_init(struct thread *thread) {
sigstack.ss_flags=0;
sigstack.ss_size = 32*SIGSTKSZ;
sigaltstack(&sigstack,0);
sigstack.ss_flags=0;
sigstack.ss_size = 32*SIGSTKSZ;
sigaltstack(&sigstack,0);
+ if(sigaltstack(&sigstack,0)<0) {
+ lose("Cannot sigaltstack: %s\n",strerror(errno));
+ }
#endif
return 1;
}
#endif
return 1;
}
@@
-123,13
+132,13
@@
struct thread *debug_get_fs() {
*/
int arch_os_thread_cleanup(struct thread *thread) {
*/
int arch_os_thread_cleanup(struct thread *thread) {
- struct modify_ldt_ldt_s ldt_entry = {
+ struct user_desc ldt_entry = {
0, 0, 0,
0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0
};
ldt_entry.entry_number=thread->tls_cookie;
0, 0, 0,
0, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 0
};
ldt_entry.entry_number=thread->tls_cookie;
- get_spinlock(&modify_ldt_lock,thread);
+ get_spinlock(&modify_ldt_lock,(long)thread);
if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
modify_ldt_lock=0;
/* modify_ldt call failed: something magical is not happening */
if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
modify_ldt_lock=0;
/* modify_ldt call failed: something magical is not happening */