Changeset 26864 in webkit

Timestamp:

Oct 21, 2007 11:26:41 PM (17 years ago)

Author:

bdash

Message:

2007-10-21 Mark Rowe <​mrowe@apple.com>

Reviewed by Alp.

​http://bugs.webkit.org/show_bug.cgi?id=15575
Bug 15575: [GTK] Implement threading using GThread

• wtf/Platform.h: Do not enable pthreads for Gtk.

2007-10-21 Mark Rowe <​mrowe@apple.com>

Reviewed by Alp.

​http://bugs.webkit.org/show_bug.cgi?id=15575
Bug 15575: [GTK] Implement threading using GThread

• WebCore.pro: Remove ThreadingPthreads.cpp from the Gtk build and link against libgthreads.
• loader/icon/IconDatabase.cpp: Initialize threading before the mutex is created to be compatible with gthreads. (WebCore::iconDatabase): (WebCore::IconDatabase::open):
• platform/Threading.h:
• platform/gtk/ThreadingGtk.cpp: Threading implementation in terms of GThread, based heavily on the pthreads implementation. (WebCore::initializeThreading): (WebCore::threadMapMutex): (WebCore::threadMap): (WebCore::establishIdentifierForThread): (WebCore::threadForIdentifier): (WebCore::clearThreadForIdentifier): (WebCore::createThread): (WebCore::waitForThreadCompletion): (WebCore::detachThread): (WebCore::Mutex::Mutex): (WebCore::Mutex::~Mutex): (WebCore::Mutex::lock): (WebCore::Mutex::tryLock): (WebCore::Mutex::unlock): (WebCore::ThreadCondition::ThreadCondition): (WebCore::ThreadCondition::~ThreadCondition): (WebCore::ThreadCondition::wait): (WebCore::ThreadCondition::signal): (WebCore::ThreadCondition::broadcast):
• storage/Database.cpp: (WebCore::Database::Database): Initialize threading when Database is used so that it will be initialized even if the icon database is compiled out

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/loader/icon/IconDatabase.cpp (modified) (2 diffs)
• WebCore/platform/Threading.h (modified) (5 diffs)
• WebCore/platform/gtk/ThreadingGtk.cpp (modified) (2 diffs)
• WebCore/storage/Database.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alp.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15575
+        Bug 15575: [GTK] Implement threading using GThread
+
+        * wtf/Platform.h: Do not enable pthreads for Gtk.
+
 2007-10-21  Mark Rowe  <mrowe@apple.com>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -215 +215 @@
 #if PLATFORM(GTK)
 #define WTF_USE_CURL 1
-#define WTF_USE_PTHREADS 1
 #endif
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-10-21  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Alp.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15575
+        Bug 15575: [GTK] Implement threading using GThread
+
+        * WebCore.pro: Remove ThreadingPthreads.cpp from the Gtk build and link against libgthreads.
+        * loader/icon/IconDatabase.cpp: Initialize threading before the mutex is created to be compatible with gthreads.
+        (WebCore::iconDatabase):
+        (WebCore::IconDatabase::open):
+        * platform/Threading.h:
+        * platform/gtk/ThreadingGtk.cpp: Threading implementation in terms of GThread, based heavily on the pthreads implementation.
+        (WebCore::initializeThreading):
+        (WebCore::threadMapMutex):
+        (WebCore::threadMap):
+        (WebCore::establishIdentifierForThread):
+        (WebCore::threadForIdentifier):
+        (WebCore::clearThreadForIdentifier):
+        (WebCore::createThread):
+        (WebCore::waitForThreadCompletion):
+        (WebCore::detachThread):
+        (WebCore::Mutex::Mutex):
+        (WebCore::Mutex::~Mutex):
+        (WebCore::Mutex::lock):
+        (WebCore::Mutex::tryLock):
+        (WebCore::Mutex::unlock):
+        (WebCore::ThreadCondition::ThreadCondition):
+        (WebCore::ThreadCondition::~ThreadCondition):
+        (WebCore::ThreadCondition::wait):
+        (WebCore::ThreadCondition::signal):
+        (WebCore::ThreadCondition::broadcast):
+        * storage/Database.cpp:
+        (WebCore::Database::Database): Initialize threading when Database is used so that it will be initialized even
+        if the icon database is compiled out
+
 2007-10-21  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/WebCore.pro

@@ -50 +50 @@
     QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
 }
+
+gtk-port: PKGCONFIG += gthread-2.0
 
 # Optional components (look for defs in config.h and included files!)
@@ -950 +952 @@
         platform/image-decoders/ico/ICOImageDecoder.cpp \
         platform/image-decoders/xbm/XBMImageDecoder.cpp \
-        platform/pthreads/ThreadingPthreads.cpp \
         ../WebKit/gtk/Api/webkitgtkframe.cpp \
         ../WebKit/gtk/Api/webkitgtkglobal.cpp \

trunk/WebCore/loader/icon/IconDatabase.cpp

@@ -96 +96 @@
 IconDatabase* iconDatabase()
 {
-    if (!sharedIconDatabase)
+    if (!sharedIconDatabase) {
+        initializeThreading();
         sharedIconDatabase = new IconDatabase;
+    }
     return sharedIconDatabase;
 }
@@ -134 +136 @@
     // Formulate the full path for the database file
     m_completeDatabasePath = pathByAppendingComponent(m_databaseDirectory, defaultDatabaseFilename());
-
-    initializeThreading();
 
     // Lock here as well as first thing in the thread so the tread doesn't actually commence until the pthread_create() call 

trunk/WebCore/platform/Threading.h

@@ -37 +37 @@
 #endif
 
+#if PLATFORM(GTK)
+typedef struct _GMutex GMutex;
+typedef struct _GCond GCond;
+#endif
+
 #include <stdint.h>
 
@@ -48 +53 @@
 int waitForThreadCompletion(ThreadIdentifier, void**);
 void detachThread(ThreadIdentifier);
+
+#if USE(PTHREADS)
+typedef pthread_mutex_t PlatformMutex;
+typedef pthread_cond_t PlatformCondition;
+#elif PLATFORM(GTK)
+typedef GMutex* PlatformMutex;
+typedef GCond* PlatformCondition;
+#else
+typedef void* PlatformMutex;
+typedef void* PlatformCondition;
+#endif
     
 class Mutex : Noncopyable {
@@ -57 +73 @@
     bool tryLock();
     void unlock();
-    
-#if USE(PTHREADS)
+
 public:
-    pthread_mutex_t& impl() { return m_mutex; }
+    PlatformMutex& impl() { return m_mutex; }
 private:
-    pthread_mutex_t m_mutex;
-#endif
+    PlatformMutex m_mutex;
 };
 
@@ -85 +99 @@
     
 private:
-#if USE(PTHREADS)
-    pthread_cond_t m_condition;
-#endif
+    PlatformCondition m_condition;
 };
     
@@ -150 +162 @@
 void initializeThreading();
 
-#if !PLATFORM(WIN)
+#if !PLATFORM(WIN) && !PLATFORM(GTK)
 inline void initializeThreading()
 {

trunk/WebCore/platform/gtk/ThreadingGtk.cpp

@@ -30 +30 @@
 #include "Threading.h"
 
+#include "HashMap.h"
 #include "Logging.h"
-#include "Vector.h"
 
 #include <glib.h>
@@ -50 +50 @@
 }
 
+void initializeThreading()
+{
+    if (!g_thread_supported())
+        g_thread_init(NULL);
+    ASSERT(g_thread_supported());
 }
+
+static Mutex& threadMapMutex()
+{
+    static Mutex mutex;
+    return mutex;
+}
+
+static HashMap<ThreadIdentifier, GThread*>& threadMap()
+{
+    static HashMap<ThreadIdentifier, GThread*> map;
+    return map;
+}
+
+static ThreadIdentifier establishIdentifierForThread(GThread*& thread)
+{
+    MutexLocker locker(threadMapMutex());
+
+    static ThreadIdentifier identifierCount = 1;
+
+    threadMap().add(identifierCount, thread);
+    
+    return identifierCount++;
+}
+
+static GThread* threadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+    
+    return threadMap().get(id);
+}
+
+static void clearThreadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    ASSERT(threadMap().contains(id));
+    
+    threadMap().remove(id);
+}
+
+ThreadIdentifier createThread(ThreadFunction entryPoint, void* data)
+{
+    GThread* thread;
+    if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) {
+        LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data);
+        return 0;
+    }
+
+    ThreadIdentifier threadID = establishIdentifierForThread(thread);
+    LOG(Threading, "Created thread with thread id %u", threadID);
+    return threadID;
+}
+
+int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
+{
+    ASSERT(threadID);
+
+    GThread* thread = threadForIdentifier(threadID);
+
+    *result = g_thread_join(thread);
+
+    clearThreadForIdentifier(threadID);
+    return 0;
+}
+
+void detachThread(ThreadIdentifier)
+{
+}
+
+Mutex::Mutex()
+    : m_mutex(g_mutex_new())
+{
+}
+
+Mutex::~Mutex()
+{
+    g_mutex_free(m_mutex);
+}
+
+void Mutex::lock()
+{
+    g_mutex_lock(m_mutex);
+}
+    
+bool Mutex::tryLock()
+{
+    return g_mutex_trylock(m_mutex);
+}
+
+void Mutex::unlock()
+{
+    g_mutex_unlock(m_mutex);
+}
+
+ThreadCondition::ThreadCondition()
+    : m_condition(g_cond_new())
+{ 
+}
+
+ThreadCondition::~ThreadCondition()
+{
+    g_cond_free(m_condition);
+}
+
+void ThreadCondition::wait(Mutex& mutex)
+{
+    g_cond_wait(m_condition, mutex.impl());
+}
+
+void ThreadCondition::signal()
+{
+    g_cond_signal(m_condition);
+}
+
+void ThreadCondition::broadcast()
+{
+    g_cond_broadcast(m_condition);
+}
+
+
+}

trunk/WebCore/storage/Database.cpp

@@ -126 +126 @@
         m_name = "";
 
+    initializeThreading();
+
     m_guid = guidForOriginAndName(m_securityOrigin.toString(), name);