Changeset 213657 in webkit for trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h

Timestamp:

Mar 9, 2017, 1:05:41 PM (8 years ago)

Author:

[email protected]

Message:

Use const AbstractLocker& (instead of const LockHolder&) in more places.
​https://bugs.webkit.org/show_bug.cgi?id=169424

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

• heap/CodeBlockSet.cpp:

(JSC::CodeBlockSet::promoteYoungCodeBlocks):

• heap/CodeBlockSet.h:
• heap/CodeBlockSetInlines.h:

(JSC::CodeBlockSet::mark):

• heap/ConservativeRoots.cpp:

(JSC::CompositeMarkHook::CompositeMarkHook):

• heap/MachineStackMarker.cpp:

(JSC::MachineThreads::tryCopyOtherThreadStacks):

• heap/MachineStackMarker.h:
• profiler/ProfilerDatabase.cpp:

(JSC::Profiler::Database::ensureBytecodesFor):

• profiler/ProfilerDatabase.h:
• runtime/SamplingProfiler.cpp:

(JSC::FrameWalker::FrameWalker):
(JSC::CFrameWalker::CFrameWalker):
(JSC::SamplingProfiler::createThreadIfNecessary):
(JSC::SamplingProfiler::takeSample):
(JSC::SamplingProfiler::start):
(JSC::SamplingProfiler::pause):
(JSC::SamplingProfiler::noticeCurrentThreadAsJSCExecutionThread):
(JSC::SamplingProfiler::clearData):
(JSC::SamplingProfiler::releaseStackTraces):

• runtime/SamplingProfiler.h:

(JSC::SamplingProfiler::setStopWatch):

• wasm/WasmMemory.cpp:

(JSC::Wasm::availableFastMemories):
(JSC::Wasm::activeFastMemories):
(JSC::Wasm::viewActiveFastMemories):

• wasm/WasmMemory.h:

Source/WTF:

• wtf/RunLoop.h:
• wtf/generic/RunLoopGeneric.cpp:

(WTF::RunLoop::wakeUp):
(WTF::RunLoop::schedule):

File:

• trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h

@@ -167 +167 @@
     void setTimingInterval(std::chrono::microseconds interval) { m_timingInterval = interval; }
     JS_EXPORT_PRIVATE void start();
-    void start(const LockHolder&);
-    Vector<StackTrace> releaseStackTraces(const LockHolder&);
+    void start(const AbstractLocker&);
+    Vector<StackTrace> releaseStackTraces(const AbstractLocker&);
     JS_EXPORT_PRIVATE String stackTracesAsJSON();
     JS_EXPORT_PRIVATE void noticeCurrentThreadAsJSCExecutionThread();
-    void noticeCurrentThreadAsJSCExecutionThread(const LockHolder&);
+    void noticeCurrentThreadAsJSCExecutionThread(const AbstractLocker&);
     void processUnverifiedStackTraces(); // You should call this only after acquiring the lock.
-    void setStopWatch(const LockHolder&, Ref<Stopwatch>&& stopwatch) { m_stopwatch = WTFMove(stopwatch); }
-    void pause(const LockHolder&);
-    void clearData(const LockHolder&);
+    void setStopWatch(const AbstractLocker&, Ref<Stopwatch>&& stopwatch) { m_stopwatch = WTFMove(stopwatch); }
+    void pause(const AbstractLocker&);
+    void clearData(const AbstractLocker&);
 
     // Used for debugging in the JSC shell/DRT.
@@ -186 +186 @@
 
 private:
-    void createThreadIfNecessary(const LockHolder&);
+    void createThreadIfNecessary(const AbstractLocker&);
     void timerLoop();
-    void takeSample(const LockHolder&, std::chrono::microseconds& stackTraceProcessingTime);
+    void takeSample(const AbstractLocker&, std::chrono::microseconds& stackTraceProcessingTime);
 
     VM& m_vm;