Changeset 106598 in webkit

Timestamp:

Feb 2, 2012 3:36:40 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Use win32 native threading
​https://bugs.webkit.org/show_bug.cgi?id=77676

Patch by Kalev Lember <​kalevlember@gmail.com> on 2012-02-02
Reviewed by Martin Robinson.

r97269 switched from glib threading to pthreads, breaking win32 GTK+.
This is a follow up, removing some leftovers in ThreadSpecific.h and
switching win32 to use the native threading in ThreadingWin.cpp.

• GNUmakefile.list.am: Compile in win32 native threading support
• wtf/ThreadSpecific.h: Remove GTK+-specific definitions

(ThreadSpecific):
(WTF::::destroy):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• wtf/ThreadSpecific.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-02  Kalev Lember  <kalevlember@gmail.com>
+
+        [GTK] Use win32 native threading
+        https://bugs.webkit.org/show_bug.cgi?id=77676
+
+        Reviewed by Martin Robinson.
+
+        r97269 switched from glib threading to pthreads, breaking win32 GTK+.
+        This is a follow up, removing some leftovers in ThreadSpecific.h and
+        switching win32 to use the native threading in ThreadingWin.cpp.
+
+        * GNUmakefile.list.am: Compile in win32 native threading support
+        * wtf/ThreadSpecific.h: Remove GTK+-specific definitions
+        (ThreadSpecific):
+        (WTF::::destroy):
+
 2012-02-02  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/GNUmakefile.list.am

@@ -757 +757 @@
 if TARGET_WIN32
 javascriptcore_sources += \
-        Source/JavaScriptCore/wtf/OSAllocatorWin.cpp
+        Source/JavaScriptCore/wtf/OSAllocatorWin.cpp \
+        Source/JavaScriptCore/wtf/ThreadFunctionInvocation.h \
+        Source/JavaScriptCore/wtf/ThreadingWin.cpp \
+        Source/JavaScriptCore/wtf/ThreadSpecificWin.cpp
 else
 javascriptcore_sources += \

trunk/Source/JavaScriptCore/wtf/ThreadSpecific.h

@@ -47 +47 @@
 #if USE(PTHREADS)
 #include <pthread.h>
-#elif PLATFORM(GTK)
-#include <glib.h>
 #elif OS(WINDOWS)
 #include <windows.h>
@@ -101 +99 @@
 #if USE(PTHREADS)
     pthread_key_t m_key;
-#elif PLATFORM(GTK)
-    GStaticPrivate m_key;
 #elif OS(WINDOWS)
     int m_index;
@@ -129 +125 @@
     ASSERT(!get());
     pthread_setspecific(m_key, new Data(ptr, this));
-}
-
-#elif PLATFORM(GTK)
-
-template<typename T>
-inline ThreadSpecific<T>::ThreadSpecific()
-{
-    g_static_private_init(&m_key);
-}
-
-template<typename T>
-inline T* ThreadSpecific<T>::get()
-{
-    Data* data = static_cast<Data*>(g_static_private_get(&m_key));
-    return data ? data->value : 0;
-}
-
-template<typename T>
-inline void ThreadSpecific<T>::set(T* ptr)
-{
-    ASSERT(!get());
-    Data* data = new Data(ptr, this);
-    g_static_private_set(&m_key, data, destroy);
 }
 
@@ -219 +192 @@
     // Some pthreads implementations zero out the pointer before calling destroy(), so we temporarily reset it.
     pthread_setspecific(data->owner->m_key, ptr);
-#elif PLATFORM(GTK)
-    // See comment as above
-    g_static_private_set(&data->owner->m_key, data, 0);
 #endif
 
@@ -229 +199 @@
 #if USE(PTHREADS)
     pthread_setspecific(data->owner->m_key, 0);
-#elif PLATFORM(GTK)
-    g_static_private_set(&data->owner->m_key, 0, 0);
 #elif OS(WINDOWS)
     TlsSetValue(tlsKeys()[data->owner->m_index], 0);