Changeset 30842 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Mar 6, 2008, 9:50:08 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

<rdar://problem/5687269> Need to create a Collator abstraction for WebCore and JavaScriptCore

Location:

trunk/JavaScriptCore/wtf

Files:

• Threading.h (modified) (2 diffs)
• ThreadingGtk.cpp (modified) (1 diff)
• ThreadingNone.cpp (modified) (1 diff)
• ThreadingPthreads.cpp (modified) (1 diff)
• ThreadingWin.cpp (modified) (1 diff)
• unicode/Collator.h (added)
• unicode/CollatorDefault.cpp (added)
• unicode/icu/CollatorICU.cpp (added)

trunk/JavaScriptCore/wtf/Threading.h

@@ -92 +92 @@
 #include <stdint.h>
 
+// For portability, we do not use thread-safe statics natively supported by some compilers (e.g. gcc).
+#define AtomicallyInitializedStatic(T, name) \
+    WTF::atomicallyInitializedStaticMutex->lock(); \
+    static T name; \
+    WTF::atomicallyInitializedStaticMutex->unlock();
+
 namespace WTF {
 
@@ -233 +239 @@
 void initializeThreading();
 
+extern Mutex* atomicallyInitializedStaticMutex;
+
 #if !PLATFORM(GTK)
 inline void initializeThreading()
 {
+    if (!atomicallyInitializedStaticMutex)
+        atomicallyInitializedStaticMutex = new Mutex;
 }
 #endif

trunk/JavaScriptCore/wtf/ThreadingGtk.cpp

@@ -37 +37 @@
 namespace WTF {
 
+Mutex* atomicallyInitializedStaticMutex;
+
 void initializeThreading()
 {
-    if (!g_thread_supported())
+    if (!g_thread_supported()) {
         g_thread_init(NULL);
+        ASSERT(!atomicallyInitializedStaticMutex);
+        atomicallyInitializedStaticMutex = new Mutex;
+    }
     ASSERT(g_thread_supported());
 }

trunk/JavaScriptCore/wtf/ThreadingNone.cpp

@@ -32 +32 @@
 namespace WTF {
 
+Mutex* atomicallyInitializedStaticMutex;
+
 ThreadIdentifier createThread(ThreadFunction, void*) { return 0; }
 int waitForThreadCompletion(ThreadIdentifier, void**) { return 0; }

trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -36 +36 @@
 namespace WTF {
 
+Mutex* atomicallyInitializedStaticMutex;
+
 static Mutex& threadMapMutex()
 {

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -68 +68 @@
 
 namespace WTF {
+
+Mutex* atomicallyInitializedStaticMutex;
 
 static Mutex& threadMapMutex()