1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
Index: qtwebkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp
===================================================================
--- qtwebkit.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2011-12-25 23:12:15.000000000 +0400
+++ qtwebkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2013-12-04 11:59:39.108002957 +0400
@@ -20,6 +20,9 @@
*/
#include "config.h"
+#if OS(SOLARIS)
+#undef _FILE_OFFSET_BITS
+#endif
#include "MachineStackMarker.h"
#include "ConservativeRoots.h"
@@ -60,6 +63,10 @@
#include <unistd.h>
#if OS(SOLARIS)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <procfs.h>
#include <thread.h>
#else
#include <pthread.h>
@@ -331,6 +338,7 @@
#error Need a thread register struct for this platform
#endif
+#if !OS(SOLARIS)
static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
{
#if OS(DARWIN)
@@ -381,6 +389,7 @@
#error Need a way to get thread registers on this platform
#endif
}
+#endif
static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
{
@@ -431,6 +440,7 @@
#endif
}
+#if !OS(SOLARIS)
static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
{
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN)
@@ -439,9 +449,24 @@
UNUSED_PARAM(regs);
#endif
}
+#endif
void MachineThreads::gatherFromOtherThread(ConservativeRoots& conservativeRoots, Thread* thread)
{
+#if OS(SOLARIS)
+ struct lwpstatus lwp;
+ char procfile[64];
+ int fd;
+ snprintf(procfile, 64, "/proc/self/lwp/%u/lwpstatus", thread->platformThread);
+ fd = open(procfile, O_RDONLY, 0);
+ if (fd == -1) {
+ fprintf(stderr, "%s: %s\n", procfile, strerror(errno));
+ abort();
+ }
+ pread(fd, &lwp, sizeof(lwp), 0);
+ close(fd);
+ void* stackPointer = (void*)lwp.pr_reg[REG_SP];
+#else
suspendThread(thread->platformThread);
PlatformThreadRegisters regs;
@@ -450,13 +475,14 @@
conservativeRoots.add(static_cast<void*>(®s), static_cast<void*>(reinterpret_cast<char*>(®s) + regSize));
void* stackPointer = otherThreadStackPointer(regs);
- void* stackBase = thread->stackBase;
- swapIfBackwards(stackPointer, stackBase);
- conservativeRoots.add(stackPointer, stackBase);
resumeThread(thread->platformThread);
freePlatformThreadRegisters(regs);
+#endif
+ void* stackBase = thread->stackBase;
+ swapIfBackwards(stackPointer, stackBase);
+ conservativeRoots.add(stackPointer, stackBase);
}
#endif
|
