| Index: src/extensions/statistics-extension.cc
|
| diff --git a/src/extensions/statistics-extension.cc b/src/extensions/statistics-extension.cc
|
| index 586b2e37cff49b32c17290174fe8d0d7db49c8cd..431a1563857dcf7b4cc0b2f0da7d781a35518e92 100644
|
| --- a/src/extensions/statistics-extension.cc
|
| +++ b/src/extensions/statistics-extension.cc
|
| @@ -41,27 +41,30 @@ v8::Handle<v8::FunctionTemplate> StatisticsExtension::GetNativeFunction(
|
| }
|
|
|
|
|
| -static void AddCounter(v8::Local<v8::Object> object,
|
| +static void AddCounter(v8::Isolate* isolate,
|
| + v8::Local<v8::Object> object,
|
| StatsCounter* counter,
|
| const char* name) {
|
| if (counter->Enabled()) {
|
| - object->Set(v8::String::New(name),
|
| + object->Set(v8::String::NewFromUtf8(isolate, name),
|
| v8::Number::New(*counter->GetInternalPointer()));
|
| }
|
| }
|
|
|
| -static void AddNumber(v8::Local<v8::Object> object,
|
| +static void AddNumber(v8::Isolate* isolate,
|
| + v8::Local<v8::Object> object,
|
| intptr_t value,
|
| const char* name) {
|
| - object->Set(v8::String::New(name),
|
| + object->Set(v8::String::NewFromUtf8(isolate, name),
|
| v8::Number::New(static_cast<double>(value)));
|
| }
|
|
|
|
|
| -static void AddNumber64(v8::Local<v8::Object> object,
|
| +static void AddNumber64(v8::Isolate* isolate,
|
| + v8::Local<v8::Object> object,
|
| int64_t value,
|
| const char* name) {
|
| - object->Set(v8::String::New(name),
|
| + object->Set(v8::String::NewFromUtf8(isolate, name),
|
| v8::Number::New(static_cast<double>(value)));
|
| }
|
|
|
| @@ -81,79 +84,87 @@ void StatisticsExtension::GetCounters(
|
| v8::Local<v8::Object> result = v8::Object::New();
|
|
|
| #define ADD_COUNTER(name, caption) \
|
| - AddCounter(result, counters->name(), #name);
|
| + AddCounter(args.GetIsolate(), result, counters->name(), #name);
|
|
|
| STATS_COUNTER_LIST_1(ADD_COUNTER)
|
| STATS_COUNTER_LIST_2(ADD_COUNTER)
|
| #undef ADD_COUNTER
|
| -#define ADD_COUNTER(name) \
|
| - AddCounter(result, counters->count_of_##name(), "count_of_" #name); \
|
| - AddCounter(result, counters->size_of_##name(), "size_of_" #name);
|
| +#define ADD_COUNTER(name) \
|
| + AddCounter(args.GetIsolate(), result, counters->count_of_##name(), \
|
| + "count_of_" #name); \
|
| + AddCounter(args.GetIsolate(), result, counters->size_of_##name(), \
|
| + "size_of_" #name);
|
|
|
| INSTANCE_TYPE_LIST(ADD_COUNTER)
|
| #undef ADD_COUNTER
|
| -#define ADD_COUNTER(name) \
|
| - AddCounter(result, counters->count_of_CODE_TYPE_##name(), \
|
| - "count_of_CODE_TYPE_" #name); \
|
| - AddCounter(result, counters->size_of_CODE_TYPE_##name(), \
|
| +#define ADD_COUNTER(name) \
|
| + AddCounter(args.GetIsolate(), result, counters->count_of_CODE_TYPE_##name(), \
|
| + "count_of_CODE_TYPE_" #name); \
|
| + AddCounter(args.GetIsolate(), result, counters->size_of_CODE_TYPE_##name(), \
|
| "size_of_CODE_TYPE_" #name);
|
|
|
| CODE_KIND_LIST(ADD_COUNTER)
|
| #undef ADD_COUNTER
|
| -#define ADD_COUNTER(name) \
|
| - AddCounter(result, counters->count_of_FIXED_ARRAY_##name(), \
|
| - "count_of_FIXED_ARRAY_" #name); \
|
| - AddCounter(result, counters->size_of_FIXED_ARRAY_##name(), \
|
| +#define ADD_COUNTER(name) \
|
| + AddCounter(args.GetIsolate(), result, \
|
| + counters->count_of_FIXED_ARRAY_##name(), \
|
| + "count_of_FIXED_ARRAY_" #name); \
|
| + AddCounter(args.GetIsolate(), result, \
|
| + counters->size_of_FIXED_ARRAY_##name(), \
|
| "size_of_FIXED_ARRAY_" #name);
|
|
|
| FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(ADD_COUNTER)
|
| #undef ADD_COUNTER
|
|
|
| - AddNumber(result, isolate->memory_allocator()->Size(),
|
| + AddNumber(args.GetIsolate(), result, isolate->memory_allocator()->Size(),
|
| "total_committed_bytes");
|
| - AddNumber(result, heap->new_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->new_space()->Size(),
|
| "new_space_live_bytes");
|
| - AddNumber(result, heap->new_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->new_space()->Available(),
|
| "new_space_available_bytes");
|
| - AddNumber(result, heap->new_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result, heap->new_space()->CommittedMemory(),
|
| "new_space_commited_bytes");
|
| - AddNumber(result, heap->old_pointer_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->old_pointer_space()->Size(),
|
| "old_pointer_space_live_bytes");
|
| - AddNumber(result, heap->old_pointer_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->old_pointer_space()->Available(),
|
| "old_pointer_space_available_bytes");
|
| - AddNumber(result, heap->old_pointer_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result,
|
| + heap->old_pointer_space()->CommittedMemory(),
|
| "old_pointer_space_commited_bytes");
|
| - AddNumber(result, heap->old_data_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->old_data_space()->Size(),
|
| "old_data_space_live_bytes");
|
| - AddNumber(result, heap->old_data_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->old_data_space()->Available(),
|
| "old_data_space_available_bytes");
|
| - AddNumber(result, heap->old_data_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result,
|
| + heap->old_data_space()->CommittedMemory(),
|
| "old_data_space_commited_bytes");
|
| - AddNumber(result, heap->code_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->code_space()->Size(),
|
| "code_space_live_bytes");
|
| - AddNumber(result, heap->code_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->code_space()->Available(),
|
| "code_space_available_bytes");
|
| - AddNumber(result, heap->code_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result, heap->code_space()->CommittedMemory(),
|
| "code_space_commited_bytes");
|
| - AddNumber(result, heap->cell_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->cell_space()->Size(),
|
| "cell_space_live_bytes");
|
| - AddNumber(result, heap->cell_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->cell_space()->Available(),
|
| "cell_space_available_bytes");
|
| - AddNumber(result, heap->cell_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result, heap->cell_space()->CommittedMemory(),
|
| "cell_space_commited_bytes");
|
| - AddNumber(result, heap->property_cell_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->property_cell_space()->Size(),
|
| "property_cell_space_live_bytes");
|
| - AddNumber(result, heap->property_cell_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->property_cell_space()->Available(),
|
| "property_cell_space_available_bytes");
|
| - AddNumber(result, heap->property_cell_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result,
|
| + heap->property_cell_space()->CommittedMemory(),
|
| "property_cell_space_commited_bytes");
|
| - AddNumber(result, heap->lo_space()->Size(),
|
| + AddNumber(args.GetIsolate(), result, heap->lo_space()->Size(),
|
| "lo_space_live_bytes");
|
| - AddNumber(result, heap->lo_space()->Available(),
|
| + AddNumber(args.GetIsolate(), result, heap->lo_space()->Available(),
|
| "lo_space_available_bytes");
|
| - AddNumber(result, heap->lo_space()->CommittedMemory(),
|
| + AddNumber(args.GetIsolate(), result, heap->lo_space()->CommittedMemory(),
|
| "lo_space_commited_bytes");
|
| - AddNumber64(result, heap->amount_of_external_allocated_memory(),
|
| + AddNumber64(args.GetIsolate(), result,
|
| + heap->amount_of_external_allocated_memory(),
|
| "amount_of_external_allocated_memory");
|
| args.GetReturnValue().Set(result);
|
| }
|
|
|