Changeset 60486 in webkit for trunk/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp

Timestamp:

Jun 1, 2010, 10:26:55 AM (15 years ago)

Author:

[email protected]

Message:

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

Reviewed by Xan Lopez.

[GTK] Use DEFINE_STATIC_LOCAL for threadMapMutex and threadMap
​https://bugs.webkit.org/show_bug.cgi?id=39831

Use DEFINE_STATIC_LOCAL for static local variables.

• wtf/gtk/ThreadingGtk.cpp: (WTF::threadMapMutex): (WTF::threadMap): (WTF::identifierByGthreadHandle):

File:

• trunk/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp (modified) (4 diffs)

trunk/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp

@@ -37 +37 @@
 #include "MainThread.h"
 #include "RandomNumberSeed.h"
+#include <wtf/StdLibExtras.h>
 
 #include <glib.h>
@@ -43 +44 @@
 namespace WTF {
 
+typedef HashMap<ThreadIdentifier, GThread*> ThreadMap;
+
 static Mutex* atomicallyInitializedStaticMutex;
 
 static Mutex& threadMapMutex()
 {
-    static Mutex mutex;
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
     return mutex;
 }
@@ -75 +78 @@
 }
 
-static HashMap<ThreadIdentifier, GThread*>& threadMap()
-{
-    static HashMap<ThreadIdentifier, GThread*> map;
+static ThreadMap& threadMap()
+{
+    DEFINE_STATIC_LOCAL(ThreadMap, map, ());
     return map;
 }
@@ -85 +88 @@
     MutexLocker locker(threadMapMutex());
 
-    HashMap<ThreadIdentifier, GThread*>::iterator i = threadMap().begin();
+    ThreadMap::iterator i = threadMap().begin();
     for (; i != threadMap().end(); ++i) {
         if (i->second == thread)