A64: Synchronize with r18084.

src/extensions/statistics-extension.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 23 matching lines @@
     "native function getV8Statistics();";
 
 
 v8::Handle<v8::FunctionTemplate> StatisticsExtension::GetNativeFunction(
     v8::Handle<v8::String> str) {
   ASSERT(strcmp(*v8::String::Utf8Value(str), "getV8Statistics") == 0);
   return v8::FunctionTemplate::New(StatisticsExtension::GetCounters);
 }
 
 
-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::Isolate* isolate,
+                        v8::Local<v8::Object> object,
+                        int64_t value,
+                        const char* name) {
+  object->Set(v8::String::NewFromUtf8(isolate, name),
+              v8::Number::New(static_cast<double>(value)));
+}
+
 
 void StatisticsExtension::GetCounters(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   Isolate* isolate = reinterpret_cast<Isolate*>(args.GetIsolate());
   Heap* heap = isolate->heap();
 
   if (args.Length() > 0) {  // GC if first argument evaluates to true.
     if (args[0]->IsBoolean() && args[0]->ToBoolean()->Value()) {
       heap->CollectAllGarbage(Heap::kNoGCFlags, "counters extension");
     }
   }
 
   Counters* counters = isolate->counters();
   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");
-  AddNumber(result, heap->amount_of_external_allocated_memory(),
-            "amount_of_external_allocated_memory");
+  AddNumber64(args.GetIsolate(), result,
+              heap->amount_of_external_allocated_memory(),
+              "amount_of_external_allocated_memory");
   args.GetReturnValue().Set(result);
 }
 
 
 void StatisticsExtension::Register() {
   static StatisticsExtension statistics_extension;
   static v8::DeclareExtension declaration(&statistics_extension);
 }
 
 } }  // namespace v8::internal