Changeset 188475 in webkit for trunk/Source/JavaScriptCore/bytecode/SamplingTool.cpp

Timestamp:

Aug 14, 2015, 9:53:37 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r188444.
​https://bugs.webkit.org/show_bug.cgi?id=148029

Broke GTK and EFL (see bug #148027) (Requested by philn on
#webkit).

Reverted changeset:

"Use WTF::Lock and WTF::Condition instead of WTF::Mutex,
WTF::ThreadCondition, std::mutex, and std::condition_variable"
​https://bugs.webkit.org/show_bug.cgi?id=147999
​http://trac.webkit.org/changeset/188444

File:

• trunk/Source/JavaScriptCore/bytecode/SamplingTool.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/SamplingTool.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2009, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -286 +286 @@
 #if ENABLE(CODEBLOCK_SAMPLING)
     if (CodeBlock* codeBlock = sample.codeBlock()) {
-        LockHolder locker(m_scriptSampleMapMutex);
+        MutexLocker locker(m_scriptSampleMapMutex);
         ScriptSampleRecord* record = m_scopeSampleMap->get(codeBlock->ownerExecutable());
         ASSERT(record);
@@ -302 +302 @@
 {
 #if ENABLE(CODEBLOCK_SAMPLING)
-    LockHolder locker(m_scriptSampleMapMutex);
+    MutexLocker locker(m_scriptSampleMapMutex);
     m_scopeSampleMap->set(script, adoptPtr(new ScriptSampleRecord(vm, script)));
 #else