Changeset 38411 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Nov 14, 2008, 5:29:33 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Alder.

​https://bugs.webkit.org/show_bug.cgi?id=21810
Remove use of static C++ objects that are destroyed at exit time (destructors)

Create DEFINE_STATIC_LOCAL macro. Change static local objects to leak to avoid
exit-time destructor. Update code that was changed to fix this issue that ran
into a gcc bug (<rdar://problem/6354696> Codegen issue with C++ static reference
in gcc build 5465). Also typdefs for template types needed to be added in some
cases so the type could make it through the macro successfully.

Basically code of the form:
static T m;
becomes:
DEFINE_STATIC_LOCAL(T, m, ());

Also any code of the form:
static T& m = *new T;
also becomes:
DEFINE_STATIC_LOCAL(T, m, ());

Location:

trunk/JavaScriptCore/wtf

Files:

• MainThread.cpp (modified) (3 diffs)
• StdLibExtras.h (added)
• ThreadingPthreads.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/MainThread.cpp

@@ -30 +30 @@
 #include "MainThread.h"
 
+#include "StdLibExtras.h"
 #include "Threading.h"
 #include "Vector.h"
@@ -54 +55 @@
 Mutex& mainThreadFunctionQueueMutex()
 {
-    static Mutex& staticMutex = *new Mutex;
+    DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
     return staticMutex;
 }
@@ -60 +61 @@
 static FunctionQueue& functionQueue()
 {
-    static FunctionQueue& staticFunctionQueue = *new FunctionQueue;
+    DEFINE_STATIC_LOCAL(FunctionQueue, staticFunctionQueue, ());
     return staticFunctionQueue;
 }

trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -30 +30 @@
 #include "Threading.h"
 
+#include "StdLibExtras.h"
+
 #if USE(PTHREADS)
 
@@ -41 +43 @@
 namespace WTF {
 
+typedef HashMap<ThreadIdentifier, pthread_t> ThreadMap;
+
 static Mutex* atomicallyInitializedStaticMutex;
 
@@ -49 +53 @@
 static Mutex& threadMapMutex()
 {
-    static Mutex& mutex = *new Mutex;
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
     return mutex;
 }
@@ -77 +81 @@
 }
 
-static HashMap<ThreadIdentifier, pthread_t>& threadMap()
-{
-    static HashMap<ThreadIdentifier, pthread_t>& map = *new HashMap<ThreadIdentifier, pthread_t>;
+static ThreadMap& threadMap()
+{
+    DEFINE_STATIC_LOCAL(ThreadMap, map, ());
     return map;
 }
@@ -98 +102 @@
     MutexLocker locker(threadMapMutex());
 
-    HashMap<ThreadIdentifier, pthread_t>::iterator i = threadMap().begin();
+    ThreadMap::iterator i = threadMap().begin();
     for (; i != threadMap().end(); ++i) {
         if (pthread_equal(i->second, pthreadHandle))