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

Timestamp:

Feb 25, 2010, 6:49:12 AM (15 years ago)

Author:

[email protected]

Message:

2010-02-25 Jochen Eisinger <​[email protected]>

Reviewed by Jeremy Orlow.

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

• 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);
 }