Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: src/runtime.cc

Issue 151145: Experimental: capture 10 frame stack trace by default. (Closed)
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime.h ('k') | test/mjsunit/stack-traces.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime.cc
diff --git a/src/runtime.cc b/src/runtime.cc
index 28254f751ea4cb00a58d72ed8df9c492fb6ddba8..355bd18a21e8fd4e45f3dd6a5236844c5e71834a 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -7414,32 +7414,46 @@ static bool ShowFrameInStackTrace(StackFrame* raw_frame, Object* caller,
// element segments each containing a receiver, function and native
// code offset.
static Object* Runtime_CollectStackTrace(Arguments args) {
- ASSERT_EQ(args.length(), 1);
+ ASSERT_EQ(args.length(), 2);
Object* caller = args[0];
+ CONVERT_NUMBER_CHECKED(int32_t, limit, Int32, args[1]);
+
+ HandleScope scope;
+
+ int initial_size = limit < 10 ? limit : 10;
+ Handle<JSArray> result = Factory::NewJSArray(initial_size * 3);
StackFrameIterator iter;
- int frame_count = 0;
bool seen_caller = false;
- while (!iter.done()) {
- if (ShowFrameInStackTrace(iter.frame(), caller, &seen_caller))
- frame_count++;
- iter.Advance();
- }
- HandleScope scope;
- Handle<JSArray> result = Factory::NewJSArray(frame_count * 3);
- int i = 0;
- seen_caller = false;
- for (iter.Reset(); !iter.done(); iter.Advance()) {
+ int cursor = 0;
+ int frames_seen = 0;
+ while (!iter.done() && frames_seen < limit) {
StackFrame* raw_frame = iter.frame();
if (ShowFrameInStackTrace(raw_frame, caller, &seen_caller)) {
+ frames_seen++;
JavaScriptFrame* frame = JavaScriptFrame::cast(raw_frame);
- result->SetElement(i++, frame->receiver());
- result->SetElement(i++, frame->function());
+ Object* recv = frame->receiver();
+ Object* fun = frame->function();
Address pc = frame->pc();
Address start = frame->code()->address();
- result->SetElement(i++, Smi::FromInt(pc - start));
+ Smi* offset = Smi::FromInt(pc - start);
+ FixedArray* elements = result->elements();
+ if (cursor + 2 < elements->length()) {
+ elements->set(cursor++, recv);
+ elements->set(cursor++, fun);
+ elements->set(cursor++, offset, SKIP_WRITE_BARRIER);
+ } else {
+ HandleScope scope;
+ SetElement(result, cursor++, Handle<Object>(recv));
+ SetElement(result, cursor++, Handle<Object>(fun));
+ SetElement(result, cursor++, Handle<Smi>(offset));
+ }
}
+ iter.Advance();
}
+
+ result->set_length(Smi::FromInt(cursor), SKIP_WRITE_BARRIER);
+
return *result;
}
« no previous file with comments | « src/runtime.h ('k') | test/mjsunit/stack-traces.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698