Changeset 55247 in webkit for trunk/JavaScriptCore/wtf/ThreadingWin.cpp

Timestamp:

Feb 25, 2010, 10:27:45 AM (15 years ago)

Author:

[email protected]

Message:

Make the context that was passed to the ThreadFunction accessible.
​https://bugs.webkit.org/show_bug.cgi?id=35379

Patch by Jochen Eisinger <​[email protected]> on 2010-02-25
Reviewed by Jeremy Orlow.

When a database is opened, right now you
don't have any context from where it is opened. The problem is that
the actual calls that open a database go through the sqlite3 vfs
layer, so there's no easy way to pass this function down to to
platform/sql/chromium/SQLFileSystemChromium*.cpp

This patch will allow you to get from anywhere within webkit a pointer
to the Thread object that actually created the thread you're currently
on (in case of the database, this can be either a thread forked of
from the main thread or from a worker thread), and query the object
for context information.

• wtf/Threading.h:
• wtf/ThreadingNone.cpp:

(WTF::threadContext):

• wtf/ThreadingPthreads.cpp:

(WTF::):
(WTF::identifierByPthreadHandle):
(WTF::establishIdentifierForPthreadHandle):
(WTF::pthreadHandleForIdentifier):
(WTF::contextForIdentifier):
(WTF::createThreadInternal):
(WTF::currentThread):
(WTF::threadContext):

• wtf/ThreadingWin.cpp:

(WTF::):
(WTF::threadMap):
(WTF::storeThreadHandleByIdentifier):
(WTF::threadHandleForIdentifier):
(WTF::contextForIdentifier):
(WTF::createThreadInternal):
(WTF::threadContext):

File:

• trunk/JavaScriptCore/wtf/ThreadingWin.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -119 +119 @@
 #pragma pack(pop)
 
+typedef struct {
+    HANDLE handle;
+    void* context;
+} ThreadInfo;
+
 void initializeCurrentThreadInternal(const char* szThreadName)
 {
@@ -166 +171 @@
 }
 
-static HashMap<DWORD, HANDLE>& threadMap()
-{
-    static HashMap<DWORD, HANDLE> map;
+static HashMap<DWORD, ThreadInfo>& threadMap()
+{
+    static HashMap<DWORD, ThreadInfo> map;
     return map;
 }
 
-static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle)
+static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle, void* context)
 {
     MutexLocker locker(threadMapMutex());
     ASSERT(!threadMap().contains(threadID));
-    threadMap().add(threadID, threadHandle);
+    ThreadInfo info;
+    info.handle = threadHandle;
+    info.context = context;
+    threadMap().add(threadID, info);
 }
 
@@ -182 +190 @@
 {
     MutexLocker locker(threadMapMutex());
-    return threadMap().get(id);
+    return threadMap().get(id).handle;
+}
+
+static void* contextForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+    return threadMap().get(id).context;
 }
 
@@ -238 +252 @@
 
     threadID = static_cast<ThreadIdentifier>(threadIdentifier);
-    storeThreadHandleByIdentifier(threadIdentifier, threadHandle);
+    storeThreadHandleByIdentifier(threadIdentifier, threadHandle, data);
 
     return threadID;
@@ -279 +293 @@
 {
     return currentThread() == mainThreadIdentifier;
+}
+
+void* threadContext(ThreadIdentifier threadID)
+{
+    return contextForIdentifier(threadID);
 }