Changeset 43392 in webkit for trunk/JavaScriptCore/bytecode/SamplingTool.cpp

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/bytecode/SamplingTool.cpp (modified) (3 diffs)

trunk/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -122 +122 @@
 bool SamplingThread::s_running = false;
 unsigned SamplingThread::s_hertz = 10000;
-
-ThreadIdentifier& SamplingThread::samplingThread() {
-    DEFINE_STATIC_LOCAL(ThreadIdentifier, staticSamplingThread, ());
-    return staticSamplingThread;
-}
+ThreadIdentifier SamplingThread::s_samplingThread;
 
 void* SamplingThread::threadStartFunc(void*)
@@ -151 +147 @@
     s_hertz = hertz;
 
-    samplingThread() = createThread(threadStartFunc, 0, "JavaScriptCore::Sampler");
+    s_samplingThread = createThread(threadStartFunc, 0, "JavaScriptCore::Sampler");
 }
 
@@ -158 +154 @@
     ASSERT(s_running);
     s_running = false;
-    waitForThreadCompletion(samplingThread(), 0);
+    waitForThreadCompletion(s_samplingThread, 0);
 }