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

Timestamp:

Feb 25, 2010, 10:20:41 AM (15 years ago)

Author:

[email protected]

Message:

Reverting to re-submit with better change log.

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

(WTF::isMainThread):

• wtf/ThreadingPthreads.cpp:

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

• wtf/ThreadingWin.cpp:

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

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)
 {
@@ -171 +166 @@
 }
 
-static HashMap<DWORD, ThreadInfo>& threadMap()
-{
-    static HashMap<DWORD, ThreadInfo> map;
+static HashMap<DWORD, HANDLE>& threadMap()
+{
+    static HashMap<DWORD, HANDLE> map;
     return map;
 }
 
-static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle, void* context)
+static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle)
 {
     MutexLocker locker(threadMapMutex());
     ASSERT(!threadMap().contains(threadID));
-    ThreadInfo info;
-    info.handle = threadHandle;
-    info.context = context;
-    threadMap().add(threadID, info);
+    threadMap().add(threadID, threadHandle);
 }
 
@@ -190 +182 @@
 {
     MutexLocker locker(threadMapMutex());
-    return threadMap().get(id).handle;
-}
-
-static void* contextForIdentifier(ThreadIdentifier id)
-{
-    MutexLocker locker(threadMapMutex());
-    return threadMap().get(id).context;
+    return threadMap().get(id);
 }
 
@@ -252 +238 @@
 
     threadID = static_cast<ThreadIdentifier>(threadIdentifier);
-    storeThreadHandleByIdentifier(threadIdentifier, threadHandle, data);
+    storeThreadHandleByIdentifier(threadIdentifier, threadHandle);
 
     return threadID;
@@ -293 +279 @@
 {
     return currentThread() == mainThreadIdentifier;
-}
-
-void* threadContext(ThreadIdentifier threadID)
-{
-    return contextForIdentifier(threadID);
 }