Changeset 188475 in webkit for trunk/Source/JavaScriptCore/interpreter/JSStack.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/interpreter/JSStack.cpp (modified) (5 diffs)

trunk/Source/JavaScriptCore/interpreter/JSStack.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2008, 2013, 2014, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34 +34 @@
 #include "JSCInlines.h"
 #include "Options.h"
-#include <wtf/Lock.h>
 
 namespace JSC {
@@ -41 +40 @@
 static size_t committedBytesCount = 0;
 
-static StaticLock stackStatisticsMutex;
+static Mutex& stackStatisticsMutex()
+{
+    DEPRECATED_DEFINE_STATIC_LOCAL(Mutex, staticMutex, ());
+    return staticMutex;
+}    
 #endif // !ENABLE(JIT)
 
@@ -137 +140 @@
 }
 
+void JSStack::initializeThreading()
+{
+    stackStatisticsMutex();
+}
+
 void JSStack::addToCommittedByteCount(long byteCount)
 {
-    LockHolder locker(stackStatisticsMutex);
+    MutexLocker locker(stackStatisticsMutex());
     ASSERT(static_cast<long>(committedBytesCount) + byteCount > -1);
     committedBytesCount += byteCount;
@@ -169 +177 @@
 {
 #if !ENABLE(JIT)
-    LockHolder locker(stackStatisticsMutex);
+    MutexLocker locker(stackStatisticsMutex());
     return committedBytesCount;
 #else