diff options
Diffstat (limited to 'Source/WebCore/inspector/InspectorProfilerAgent.cpp')
| -rw-r--r-- | Source/WebCore/inspector/InspectorProfilerAgent.cpp | 55 |
1 files changed, 41 insertions, 14 deletions
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp index 8c4f28f..550febf 100644 --- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp +++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp @@ -33,8 +33,8 @@ #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR) #include "Console.h" +#include "InspectorAgent.h" #include "InspectorConsoleAgent.h" -#include "InspectorController.h" #include "InspectorFrontend.h" #include "InspectorValues.h" #include "KURL.h" @@ -56,16 +56,16 @@ static const char* const UserInitiatedProfileName = "org.webkit.profiles.user-in static const char* const CPUProfileType = "CPU"; static const char* const HeapProfileType = "HEAP"; -PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InspectorController* inspectorController) +PassOwnPtr<InspectorProfilerAgent> InspectorProfilerAgent::create(InspectorAgent* inspectorAgent) { - OwnPtr<InspectorProfilerAgent> agent = adoptPtr(new InspectorProfilerAgent(inspectorController)); + OwnPtr<InspectorProfilerAgent> agent = adoptPtr(new InspectorProfilerAgent(inspectorAgent)); return agent.release(); } -InspectorProfilerAgent::InspectorProfilerAgent(InspectorController* inspectorController) - : m_inspectorController(inspectorController) +InspectorProfilerAgent::InspectorProfilerAgent(InspectorAgent* inspectorAgent) + : m_inspectorAgent(inspectorAgent) , m_frontend(0) - , m_enabled(ScriptProfiler::isProfilerAlwaysEnabled()) + , m_enabled(false) , m_recordingUserInitiatedProfile(false) , m_currentUserInitiatedProfileNumber(-1) , m_nextUserInitiatedProfileNumber(1) @@ -93,7 +93,7 @@ void InspectorProfilerAgent::addProfileFinishedMessageToConsole(PassRefPtr<Scrip RefPtr<ScriptProfile> profile = prpProfile; String title = profile->title(); String message = makeString("Profile \"webkit-profile://", CPUProfileType, '/', encodeWithURLEscapeSequences(title), '#', String::number(profile->uid()), "\" finished."); - m_inspectorController->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL); + m_inspectorAgent->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL); } void InspectorProfilerAgent::addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL) @@ -101,7 +101,7 @@ void InspectorProfilerAgent::addStartProfilingMessageToConsole(const String& tit if (!m_frontend) return; String message = makeString("Profile \"webkit-profile://", CPUProfileType, '/', encodeWithURLEscapeSequences(title), "#0\" started."); - m_inspectorController->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL); + m_inspectorAgent->consoleAgent()->addMessageToConsole(JSMessageSource, LogMessageType, LogMessageLevel, message, lineNumber, sourceURL); } PassRefPtr<InspectorObject> InspectorProfilerAgent::createProfileHeader(const ScriptProfile& profile) @@ -220,7 +220,9 @@ void InspectorProfilerAgent::resetState() void InspectorProfilerAgent::resetFrontendProfiles() { - if (m_frontend && m_profiles.begin() == m_profiles.end()) + if (m_frontend + && m_profiles.begin() == m_profiles.end() + && m_snapshots.begin() == m_snapshots.end()) m_frontend->resetProfiles(); } @@ -229,13 +231,13 @@ void InspectorProfilerAgent::startUserInitiatedProfiling() if (m_recordingUserInitiatedProfile) return; if (!enabled()) { - enable(false); + enable(true); ScriptDebugServer::shared().recompileAllJSFunctions(); } m_recordingUserInitiatedProfile = true; String title = getCurrentUserInitiatedProfileName(true); #if USE(JSC) - JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorController->inspectedPage()->mainFrame(), debuggerWorld())->globalExec(); + JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorAgent->inspectedPage()->mainFrame(), debuggerWorld())->globalExec(); #else ScriptState* scriptState = 0; #endif @@ -251,7 +253,7 @@ void InspectorProfilerAgent::stopUserInitiatedProfiling(bool ignoreProfile) m_recordingUserInitiatedProfile = false; String title = getCurrentUserInitiatedProfileName(); #if USE(JSC) - JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorController->inspectedPage()->mainFrame(), debuggerWorld())->globalExec(); + JSC::ExecState* scriptState = toJSDOMWindow(m_inspectorAgent->inspectedPage()->mainFrame(), debuggerWorld())->globalExec(); #else // Use null script state to avoid filtering by context security token. // All functions from all iframes should be visible from Inspector UI. @@ -267,12 +269,37 @@ void InspectorProfilerAgent::stopUserInitiatedProfiling(bool ignoreProfile) toggleRecordButton(false); } -void InspectorProfilerAgent::takeHeapSnapshot() +namespace { + +class HeapSnapshotProgress: public ScriptProfiler::HeapSnapshotProgress { +public: + explicit HeapSnapshotProgress(InspectorFrontend* frontend) + : m_frontend(frontend) { } + void Start(int totalWork) + { + m_totalWork = totalWork; + } + void Worked(int workDone) + { + if (m_frontend) + m_frontend->reportHeapSnapshotProgress(workDone, m_totalWork); + } + void Done() { } + bool isCanceled() { return false; } +private: + InspectorFrontend* m_frontend; + int m_totalWork; +}; + +}; + +void InspectorProfilerAgent::takeHeapSnapshot(bool detailed) { String title = makeString(UserInitiatedProfileName, '.', String::number(m_nextUserInitiatedHeapSnapshotNumber)); ++m_nextUserInitiatedHeapSnapshotNumber; - RefPtr<ScriptHeapSnapshot> snapshot = ScriptProfiler::takeHeapSnapshot(title); + HeapSnapshotProgress progress(m_frontend); + RefPtr<ScriptHeapSnapshot> snapshot = ScriptProfiler::takeHeapSnapshot(title, detailed ? &progress : 0); if (snapshot) { m_snapshots.add(snapshot->uid(), snapshot); if (m_frontend) |