Changeset 99374 in webkit for trunk/Source/JavaScriptCore/wtf/Atomics.h

Timestamp:

Nov 6, 2011, 3:39:12 AM (14 years ago)

Author:

[email protected]

Message:

JSC should be able to sample itself in a more flexible way than just sampling flags
​https://bugs.webkit.org/show_bug.cgi?id=71522

Source/JavaScriptCore:

Reviewed by Gavin Barraclough.

Added a construct that looks like SamplingRegion samplingRegion("name").

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/SamplingTool.cpp:

(JSC::SamplingRegion::Locker::Locker):
(JSC::SamplingRegion::Locker::~Locker):
(JSC::SamplingRegion::sample):
(JSC::SamplingRegion::dump):
(JSC::SamplingRegion::dumpInternal):
(JSC::SamplingThread::threadStartFunc):

• bytecode/SamplingTool.h:

(JSC::SamplingRegion::SamplingRegion):
(JSC::SamplingRegion::~SamplingRegion):
(JSC::SamplingRegion::exchangeCurrent):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::generate):

• dfg/DFGDriver.cpp:

(JSC::DFG::compile):

• heap/Heap.cpp:

(JSC::Heap::markRoots):
(JSC::Heap::collect):

• heap/VTableSpectrum.cpp:

(JSC::VTableSpectrum::countVPtr):
(JSC::VTableSpectrum::dump):

• heap/VTableSpectrum.h:
• jsc.cpp:

(main):
(runWithScripts):

• parser/Parser.h:

(JSC::parse):

• runtime/Executable.cpp:

(JSC::EvalExecutable::compileInternal):
(JSC::ProgramExecutable::compileInternal):
(JSC::FunctionExecutable::compileForCallInternal):
(JSC::FunctionExecutable::compileForConstructInternal):

• wtf/Atomics.h:

(WTF::weakCompareAndSwap):

• wtf/Platform.h:
• wtf/Spectrum.h: Added.

(WTF::Spectrum::Spectrum):
(WTF::Spectrum::add):
(WTF::Spectrum::get):
(WTF::Spectrum::begin):
(WTF::Spectrum::end):
(WTF::Spectrum::KeyAndCount::KeyAndCount):
(WTF::Spectrum::KeyAndCount::operator<):
(WTF::Spectrum::buildList):

• wtf/wtf.pri:

Source/JavaScriptGlue:

Reviewed by Gavin Barraclough.

• ForwardingHeaders/wtf/Spectrum.h: Added.

Source/WebCore:

Reviewed by Gavin Barraclough.

No new tests, since no functionality changed.

• ForwardingHeaders/wtf/Spectrum.h: Added.

File:

• trunk/Source/JavaScriptCore/wtf/Atomics.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/wtf/Atomics.h

@@ -127 +127 @@
         "lock; cmpxchgl %3, %2\n\t"
         "sete %1"
-        : "+a"(expected), "=r"(result), "+m"(*location)
+        : "+a"(expected), "=q"(result), "+m"(*location)
         : "r"(newValue)
         : "memory"
@@ -141 +141 @@
 }
 
+inline bool weakCompareAndSwap(void*volatile* location, void* expected, void* newValue)
+{
+    // FIXME: Implement COMPARE_AND_SWAP on other architectures and compilers. Currently
+    // it only works on X86 or X86_64 with a GCC-style compiler.
+#if ENABLE(COMPARE_AND_SWAP)
+    bool result;
+    asm volatile(
+#if CPU(X86_64)
+        "lock; cmpxchgq %3, %2\n\t"
+#else
+        "lock; cmpxchgl %3, %2\n\t"
+#endif
+        "sete %1"
+        : "+a"(expected), "=q"(result), "+m"(*location)
+        : "r"(newValue)
+        : "memory"
+        );
+    return result;
+#else // ENABLE(COMPARE_AND_SWAP)
+    UNUSED_PARAM(location);
+    UNUSED_PARAM(expected);
+    UNUSED_PARAM(newValue);
+    CRASH();
+    return 0;
+#endif // ENABLE(COMPARE_AND_SWAP)
+}
+
+inline bool weakCompareAndSwap(volatile uintptr_t* location, uintptr_t expected, uintptr_t newValue)
+{
+    return weakCompareAndSwap(reinterpret_cast<void*volatile*>(location), reinterpret_cast<void*>(expected), reinterpret_cast<void*>(newValue));
+}
+
 } // namespace WTF