Changeset 155013 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Sep 3, 2013, 5:26:57 PM (12 years ago)

Author:

[email protected]

Message:

Converting StackIterator to a callback interface.
​https://bugs.webkit.org/show_bug.cgi?id=120564.

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

• API/JSContextRef.cpp:

(BacktraceFunctor::BacktraceFunctor):
(BacktraceFunctor::operator()):
(JSContextCreateBacktrace):

• interpreter/CallFrame.cpp:
• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp:

(JSC::DumpRegisterFunctor::DumpRegisterFunctor):
(JSC::DumpRegisterFunctor::operator()):
(JSC::Interpreter::dumpRegisters):
(JSC::unwindCallFrame):
(JSC::GetStackTraceFunctor::GetStackTraceFunctor):
(JSC::GetStackTraceFunctor::operator()):
(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::stackTraceAsString):
(JSC::UnwindFunctor::UnwindFunctor):
(JSC::UnwindFunctor::operator()):
(JSC::Interpreter::unwind):

• interpreter/Interpreter.h:
• interpreter/StackIterator.cpp:

(JSC::StackIterator::numberOfFrames):
(JSC::StackIterator::gotoFrameAtIndex):
(JSC::StackIterator::gotoNextFrameWithFilter):
(JSC::StackIterator::resetIterator):
(JSC::StackIterator::Frame::print):
(debugPrintCallFrame):
(DebugPrintStackFunctor::operator()):
(debugPrintStack): Added for debugging convenience.

• interpreter/StackIterator.h:

(JSC::StackIterator::Frame::index):
(JSC::StackIterator::iterate):

• jsc.cpp:

(FunctionJSCStackFunctor::FunctionJSCStackFunctor):
(FunctionJSCStackFunctor::operator()):
(functionJSCStack):

• profiler/ProfileGenerator.cpp:

(JSC::AddParentForConsoleStartFunctor::AddParentForConsoleStartFunctor):
(JSC::AddParentForConsoleStartFunctor::foundParent):
(JSC::AddParentForConsoleStartFunctor::operator()):
(JSC::ProfileGenerator::addParentForConsoleStart):

• runtime/JSFunction.cpp:

(JSC::RetrieveArgumentsFunctor::RetrieveArgumentsFunctor):
(JSC::RetrieveArgumentsFunctor::result):
(JSC::RetrieveArgumentsFunctor::operator()):
(JSC::retrieveArguments):
(JSC::RetrieveCallerFunctionFunctor::RetrieveCallerFunctionFunctor):
(JSC::RetrieveCallerFunctionFunctor::result):
(JSC::RetrieveCallerFunctionFunctor::operator()):
(JSC::retrieveCallerFunction):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::GlobalFuncProtoGetterFunctor::GlobalFuncProtoGetterFunctor):
(JSC::GlobalFuncProtoGetterFunctor::result):
(JSC::GlobalFuncProtoGetterFunctor::operator()):
(JSC::globalFuncProtoGetter):
(JSC::GlobalFuncProtoSetterFunctor::GlobalFuncProtoSetterFunctor):
(JSC::GlobalFuncProtoSetterFunctor::allowsAccess):
(JSC::GlobalFuncProtoSetterFunctor::operator()):
(JSC::globalFuncProtoSetter):

• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructorGetPrototypeOfFunctor::ObjectConstructorGetPrototypeOfFunctor):
(JSC::ObjectConstructorGetPrototypeOfFunctor::result):
(JSC::ObjectConstructorGetPrototypeOfFunctor::operator()):
(JSC::objectConstructorGetPrototypeOf):

Source/WebCore:

No new tests.

• bindings/js/JSXMLHttpRequestCustom.cpp:

(WebCore::SendFunctor::SendFunctor):
(WebCore::SendFunctor::hasViableFrame):
(WebCore::SendFunctor::operator()):
(WebCore::JSXMLHttpRequest::send):

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::CreateScriptCallStackFunctor::CreateScriptCallStackFunctor):
(WebCore::CreateScriptCallStackFunctor::operator()):
(WebCore::createScriptCallStack):
(WebCore::CreateScriptCallStackForConsoleFunctor::CreateScriptCallStackForConsoleFunctor):
(WebCore::CreateScriptCallStackForConsoleFunctor::operator()):

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -213 +213 @@
     return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
 }
-    
+
+class BacktraceFunctor {
+public:
+    BacktraceFunctor(StringBuilder& builder, unsigned remainingCapacityForFrameCapture)
+        : m_builder(builder)
+        , m_remainingCapacityForFrameCapture(remainingCapacityForFrameCapture)
+    {
+    }
+
+    StackIterator::Status operator()(StackIterator& iter)
+    {
+        if (m_remainingCapacityForFrameCapture) {
+            // If callee is unknown, but we've not added any frame yet, we should
+            // still add the frame, because something called us, and gave us arguments.
+            JSObject* callee = iter->callee();
+            if (!callee && iter->index())
+                return StackIterator::Done;
+
+            StringBuilder& builder = m_builder;
+            if (!builder.isEmpty())
+                builder.append('\n');
+            builder.append('#');
+            builder.appendNumber(iter->index());
+            builder.append(' ');
+            builder.append(iter->functionName());
+            builder.appendLiteral("() at ");
+            builder.append(iter->sourceURL());
+            if (iter->isJSFrame()) {
+                builder.append(':');
+                unsigned lineNumber;
+                unsigned unusedColumn;
+                iter->computeLineAndColumn(lineNumber, unusedColumn);
+                builder.appendNumber(lineNumber);
+            }
+
+            if (!callee)
+                return StackIterator::Done;
+
+            m_remainingCapacityForFrameCapture--;
+            return StackIterator::Continue;
+        }
+        return StackIterator::Done;
+    }
+
+private:
+    StringBuilder& m_builder;
+    unsigned m_remainingCapacityForFrameCapture;
+};
+
 JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize)
 {
@@ -224 +272 @@
     StringBuilder builder;
     CallFrame* frame = exec->vm().topCallFrame;
-    size_t i = 0;
+
     ASSERT(maxStackSize);
-    for (StackIterator iter = frame->begin(); iter != frame->end() && maxStackSize--; ++iter, ++i) {
-        JSObject* callee = iter->callee();
-        // If callee is unknown, but we've not added any frame yet, we should
-        // still add the frame, because something called us, and gave us arguments.
-        if (!callee && i)
-            break;
-
-        if (!builder.isEmpty())
-            builder.append('\n');
-        builder.append('#');
-        builder.appendNumber(i);
-        builder.append(' ');
-        builder.append(iter->functionName());
-        builder.appendLiteral("() at ");
-        builder.append(iter->sourceURL());
-        if (iter->isJSFrame()) {
-            builder.append(':');
-            unsigned lineNumber;
-            unsigned unusedColumn;
-            iter->computeLineAndColumn(lineNumber, unusedColumn);
-            builder.appendNumber(lineNumber);
-        }
-
-        if (!callee)
-            break;
-    }
+    BacktraceFunctor functor(builder, maxStackSize);
+    StackIterator iter = frame->begin();
+    iter.iterate(functor);
 
     return OpaqueJSString::create(builder.toString()).leakRef();