Changeset 118038 in webkit

Timestamp:

May 22, 2012 1:23:44 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] getPlatformThreadRegisters() should fetch target thread's registers
​https://bugs.webkit.org/show_bug.cgi?id=87148

Patch by Yong Li <​yoli@rim.com> on 2012-05-22
Reviewed by George Staikos.

Our previous implementation of getPlatformThreadRegisters() read registers in current
thread's context but it is supposed to read the target thread's registers.

• heap/MachineStackMarker.cpp:

(JSC::getPlatformThreadRegisters):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/MachineStackMarker.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-05-22  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] getPlatformThreadRegisters() should fetch target thread's registers
+        https://bugs.webkit.org/show_bug.cgi?id=87148
+
+        Reviewed by George Staikos.
+
+        Our previous implementation of getPlatformThreadRegisters() read registers in current
+        thread's context but it is supposed to read the target thread's registers.
+
+        * heap/MachineStackMarker.cpp:
+        (JSC::getPlatformThreadRegisters):
+
 2012-05-05  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp

@@ -357 +357 @@
 #elif OS(QNX)
     memset(&regs, 0, sizeof(regs));
-    regs.tid = pthread_self();
-    int fd = open("/proc/self", O_RDONLY);
+    regs.tid = platformThread;
+    // FIXME: If we find this hurts performance, we can consider caching the fd and keeping it open.
+    int fd = open("/proc/self/as", O_RDONLY);
     if (fd == -1) {
-        LOG_ERROR("Unable to open /proc/self (errno: %d)", errno);
+        LOG_ERROR("Unable to open /proc/self/as (errno: %d)", errno);
         CRASH();
     }
-    devctl(fd, DCMD_PROC_TIDSTATUS, &regs, sizeof(regs), 0);
+    int rc = devctl(fd, DCMD_PROC_TIDSTATUS, &regs, sizeof(regs), 0);
+    if (rc != EOK) {
+        LOG_ERROR("devctl(DCMD_PROC_TIDSTATUS) failed (error: %d)", rc);
+        CRASH();
+    }
     close(fd);
+    return sizeof(struct _debug_thread_info);
 #elif USE(PTHREADS)
     pthread_attr_init(&regs);