Changeset 61712 in webkit for trunk/JavaScriptCore/wtf/ThreadSpecific.h

Timestamp:

Jun 23, 2010, 3:27:59 PM (15 years ago)

Author:

[email protected]

Message:

2010-06-23 Kwang Yul Seo <​[email protected]>

Reviewed by Oliver Hunt.

[GTK] Implement ThreadSpecific with glib
​https://bugs.webkit.org/show_bug.cgi?id=39829

Implement ThreadSpecific with glib's GStaticPrivate.
This patch makes it possible to build GTK port without pthread.

• wtf/ThreadSpecific.h: (WTF::::ThreadSpecific): (WTF::::~ThreadSpecific): (WTF::::get): (WTF::::set): (WTF::::destroy):

File:

• trunk/JavaScriptCore/wtf/ThreadSpecific.h (modified) (9 diffs)

trunk/JavaScriptCore/wtf/ThreadSpecific.h

@@ -48 +48 @@
 #elif PLATFORM(QT)
 #include <QThreadStorage>
+#elif PLATFORM(GTK)
+#include <glib.h>
 #elif OS(WINDOWS)
 #include <windows.h>
@@ -54 +56 @@
 namespace WTF {
 
-#if !USE(PTHREADS) && !PLATFORM(QT) && OS(WINDOWS)
+#if !USE(PTHREADS) && !PLATFORM(QT) && !PLATFORM(GTK) && OS(WINDOWS)
 // ThreadSpecificThreadExit should be called each time when a thread is detached.
 // This is done automatically for threads created with WTF::createThread.
@@ -69 +71 @@
 
 private:
-#if !USE(PTHREADS) && !PLATFORM(QT) && OS(WINDOWS)
+#if !USE(PTHREADS) && !PLATFORM(QT) && !PLATFORM(GTK) && OS(WINDOWS)
     friend void ThreadSpecificThreadExit();
 #endif
@@ -77 +79 @@
     void static destroy(void* ptr);
 
-#if USE(PTHREADS) || PLATFORM(QT) || OS(WINDOWS)
+#if USE(PTHREADS) || PLATFORM(QT) || PLATFORM(GTK) || OS(WINDOWS)
     struct Data : Noncopyable {
         Data(T* value, ThreadSpecific<T>* owner) : value(value), owner(owner) {}
@@ -86 +88 @@
         T* value;
         ThreadSpecific<T>* owner;
-#if !USE(PTHREADS) && !PLATFORM(QT)
+#if !USE(PTHREADS) && !PLATFORM(QT) && !PLATFORM(GTK)
         void (*destructor)(void*);
 #endif
@@ -99 +101 @@
 #elif PLATFORM(QT)
     QThreadStorage<Data*> m_key;
+#elif PLATFORM(GTK)
+    GStaticPrivate m_key;
 #elif OS(WINDOWS)
     int m_index;
@@ -185 +189 @@
     Data* data = new Data(ptr, this);
     m_key.setLocalData(data);
+}
+
+#elif PLATFORM(GTK)
+
+template<typename T>
+inline ThreadSpecific<T>::ThreadSpecific()
+{
+    g_static_private_init(&m_key);
+}
+
+template<typename T>
+inline ThreadSpecific<T>::~ThreadSpecific()
+{
+    g_static_private_free(&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);
 }
 
@@ -254 +287 @@
     // 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
 #if PLATFORM(QT)
@@ -267 +303 @@
 #elif PLATFORM(QT)
     // Do nothing here
+#elif PLATFORM(GTK)
+    g_static_private_set(&data->owner->m_key, 0, 0);
 #elif OS(WINDOWS)
     TlsSetValue(tlsKeys()[data->owner->m_index], 0);