Changeset 43392 in webkit for trunk/JavaScriptCore/wtf/Threading.h

Timestamp:

May 7, 2009, 11:47:19 PM (16 years ago)

Author:

[email protected]

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=25640>.
Bug 25640: Crash on quit in r43384 nightly build on Leopard w/ Safari 4 beta installed

Rubber-stamped by Oliver Hunt.

Roll out r43366 as it removed symbols that Safari 4 Beta uses.

File:

• trunk/JavaScriptCore/wtf/Threading.h (modified) (5 diffs)

trunk/JavaScriptCore/wtf/Threading.h

@@ -86 +86 @@
 typedef struct _GMutex GMutex;
 typedef struct _GCond GCond;
-typedef struct _GThread GThread;
 #endif
 
@@ -93 +92 @@
 QT_BEGIN_NAMESPACE
 class QMutex;
-class QThread;
 class QWaitCondition;
 QT_END_NAMESPACE
@@ -108 +106 @@
 namespace WTF {
 
+typedef uint32_t ThreadIdentifier;
+typedef void* (*ThreadFunction)(void* argument);
+
+// Returns 0 if thread creation failed.
+// The thread name must be a literal since on some platforms it's passed in to the thread.
+ThreadIdentifier createThread(ThreadFunction, void*, const char* threadName);
+
+// Internal platform-specific createThread implementation.
+ThreadIdentifier createThreadInternal(ThreadFunction, void*, const char* threadName);
+
+// Called in the thread during initialization.
+// Helpful for platforms where the thread name must be set from within the thread.
+void setThreadNameInternal(const char* threadName);
+
+ThreadIdentifier currentThread();
+bool isMainThread();
+int waitForThreadCompletion(ThreadIdentifier, void**);
+void detachThread(ThreadIdentifier);
+
 #if USE(PTHREADS)
 typedef pthread_mutex_t PlatformMutex;
 typedef pthread_cond_t PlatformCondition;
-typedef pthread_t PlatformThreadIdentifier;
 #elif PLATFORM(GTK)
 typedef GOwnPtr<GMutex> PlatformMutex;
 typedef GOwnPtr<GCond> PlatformCondition;
-typedef GThread* PlatformThreadIdentifier;
 #elif PLATFORM(QT)
 typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
 typedef QT_PREPEND_NAMESPACE(QWaitCondition)* PlatformCondition;
-typedef QT_PREPEND_NAMESPACE(QThread)* PlatformThreadIdentifier;
 #elif PLATFORM(WIN_OS)
 struct PlatformMutex {
@@ -136 +150 @@
     void signal(bool unblockAll);
 };
-typedef unsigned PlatformThreadIdentifier;
 #else
 typedef void* PlatformMutex;
@@ -142 +155 @@
 #endif
     
-// Platform-independent wrapper for thread id. Assignable and copyable.
-// The only way to obtain a valid ThreadIdentifier is from createThread(...) or currentThread() functions.
-// ThreadIdentifier remains valid for as long as its thread is alive and is not automatically invalidated
-// when thread terminates. Since platform-dependent thread ids can be recycled, stale ThreadIdentifier
-// may reference a completely unrelated thread after its original thread terminates.
-class ThreadIdentifier {
-public:
-    ThreadIdentifier()
-        : m_platformId(0)
-    {
-        ASSERT(!isValid());
-    }
-
-    explicit ThreadIdentifier(PlatformThreadIdentifier platformId)
-        : m_platformId(platformId)
-    {
-        ASSERT(isValid());
-    }
-
-    bool isValid() const  { return m_platformId; }
-    void invalidate() { m_platformId = 0; }
-
-    bool operator==(const ThreadIdentifier&) const;
-    bool operator!=(const ThreadIdentifier&) const;
-
-    PlatformThreadIdentifier platformId() const { return m_platformId;  }
-
-private:
-    PlatformThreadIdentifier m_platformId;
-};
-
-typedef void* (*ThreadFunction)(void* argument);
-
-// Returns invalid identifier if thread creation failed.
-// The thread name must be a literal since on some platforms it's passed in to the thread.
-ThreadIdentifier createThread(ThreadFunction, void*, const char* threadName);
-
-// Internal platform-specific createThread implementation.
-ThreadIdentifier createThreadInternal(ThreadFunction, void*, const char* threadName);
-
-// Called in the thread during initialization.
-// Helpful for platforms where the thread name must be set from within the thread.
-void setThreadNameInternal(const char* threadName);
-
-ThreadIdentifier currentThread();
-bool isMainThread();
-int waitForThreadCompletion(ThreadIdentifier, void**);
-void detachThread(ThreadIdentifier);
-
 class Mutex : Noncopyable {
 public: