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

Side by Side Diff: src/extensions/statistics-extension.cc

Issue 1303393004: Revert of [heap] More flag cleanup. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « src/debug/debug.cc ('k') | src/heap-snapshot-generator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/extensions/statistics-extension.h" 5 #include "src/extensions/statistics-extension.h"
6 6
7 #include "src/counters.h" 7 #include "src/counters.h"
8 #include "src/heap/heap-inl.h" 8 #include "src/heap/heap-inl.h"
9 #include "src/isolate.h" 9 #include "src/isolate.h"
10 #include "src/objects-inl.h" // TODO(mstarzinger): Temporary cycle breaker! 10 #include "src/objects-inl.h" // TODO(mstarzinger): Temporary cycle breaker!
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void StatisticsExtension::GetCounters( 61 void StatisticsExtension::GetCounters(
62 const v8::FunctionCallbackInfo<v8::Value>& args) { 62 const v8::FunctionCallbackInfo<v8::Value>& args) {
63 Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate()); 63 Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
64 Heap* heap = isolate->heap(); 64 Heap* heap = isolate->heap();
65 65
66 if (args.Length() > 0) { // GC if first argument evaluates to true. 66 if (args.Length() > 0) { // GC if first argument evaluates to true.
67 if (args[0]->IsBoolean() && 67 if (args[0]->IsBoolean() &&
68 args[0] 68 args[0]
69 ->BooleanValue(args.GetIsolate()->GetCurrentContext()) 69 ->BooleanValue(args.GetIsolate()->GetCurrentContext())
70 .FromMaybe(false)) { 70 .FromMaybe(false)) {
71 heap->CollectAllGarbage("counters extension", Heap::kNoGCFlags); 71 heap->CollectAllGarbage(Heap::kNoGCFlags, "counters extension");
72 } 72 }
73 } 73 }
74 74
75 Counters* counters = isolate->counters(); 75 Counters* counters = isolate->counters();
76 v8::Local<v8::Object> result = v8::Object::New(args.GetIsolate()); 76 v8::Local<v8::Object> result = v8::Object::New(args.GetIsolate());
77 77
78 struct StatisticsCounter { 78 struct StatisticsCounter {
79 v8::internal::StatsCounter* counter; 79 v8::internal::StatsCounter* counter;
80 const char* name; 80 const char* name;
81 }; 81 };
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 138
139 AddNumber64(args.GetIsolate(), result, 139 AddNumber64(args.GetIsolate(), result,
140 heap->amount_of_external_allocated_memory(), 140 heap->amount_of_external_allocated_memory(),
141 "amount_of_external_allocated_memory"); 141 "amount_of_external_allocated_memory");
142 args.GetReturnValue().Set(result); 142 args.GetReturnValue().Set(result);
143 } 143 }
144 144
145 } // namespace internal 145 } // namespace internal
146 } // namespace v8 146 } // namespace v8
OLDNEW
« no previous file with comments | « src/debug/debug.cc ('k') | src/heap-snapshot-generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698