Fix use of history timers in background threads.

src/wasm/module-decoder.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/wasm/module-decoder.h"
 
 #include "src/base/functional.h"
 #include "src/base/platform/platform.h"
 #include "src/base/template-utils.h"
 #include "src/counters.h"
@@ skipping 1193 matching lines @@
     // FunctionSig stores the return types first.
     ValueType* buffer = zone->NewArray<ValueType>(param_count + return_count);
     uint32_t b = 0;
     for (uint32_t i = 0; i < return_count; ++i) buffer[b++] = returns[i];
     for (uint32_t i = 0; i < param_count; ++i) buffer[b++] = params[i];
 
     return new (zone) FunctionSig(return_count, param_count, buffer);
   }
 };
 
-ModuleResult DecodeWasmModuleInternal(Isolate* isolate,
-                                      const byte* module_start,
-                                      const byte* module_end,
-                                      bool verify_functions,
-                                      ModuleOrigin origin, bool is_sync) {
+}  // namespace
+
+ModuleResult DecodeWasmModule(Isolate* isolate, const byte* module_start,
+                              const byte* module_end, bool verify_functions,
+                              ModuleOrigin origin, Counters* counters,
+                              bool is_sync) {
+  auto counter = origin == kWasmOrigin
+                     ? counters->wasm_decode_wasm_module_time()
+                     : counters->wasm_decode_asm_module_time();
+  TimedHistogramScope wasm_decode_module_time_scope(counter);
   size_t size = module_end - module_start;
   if (module_start > module_end) return ModuleResult::Error("start > end");
   if (size >= kV8MaxWasmModuleSize)
     return ModuleResult::Error("size > maximum module size: %zu", size);
   // TODO(bradnelson): Improve histogram handling of size_t.
   if (is_sync) {
     // TODO(karlschimpf): Make this work when asynchronous.
     // https://bugs.chromium.org/p/v8/issues/detail?id=6361
     auto counter = origin == kWasmOrigin
-                       ? isolate->counters()->wasm_wasm_module_size_bytes()
-                       : isolate->counters()->wasm_asm_module_size_bytes();
+                       ? counters->wasm_wasm_module_size_bytes()
+                       : counters->wasm_asm_module_size_bytes();
     counter->AddSample(static_cast<int>(size));
   }
   // Signatures are stored in zone memory, which have the same lifetime
   // as the {module}.
   ModuleDecoder decoder(module_start, module_end, origin);
   ModuleResult result = decoder.DecodeModule(isolate, verify_functions);
   // TODO(bradnelson): Improve histogram handling of size_t.
   // TODO(titzer): this isn't accurate, since it doesn't count the data
   // allocated on the C++ heap.
   // https://bugs.chromium.org/p/chromium/issues/detail?id=657320
   if (is_sync && result.ok()) {
     // TODO(karlschimpf): Make this work when asynchronous.
     // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-    auto counter =
-        origin == kWasmOrigin
-            ? isolate->counters()->wasm_decode_wasm_module_peak_memory_bytes()
-            : isolate->counters()->wasm_decode_asm_module_peak_memory_bytes();
+    auto counter = origin == kWasmOrigin
+                       ? counters->wasm_decode_wasm_module_peak_memory_bytes()
+                       : counters->wasm_decode_asm_module_peak_memory_bytes();
     counter->AddSample(
         static_cast<int>(result.val->signature_zone->allocation_size()));
   }
   return result;
 }
 
-}  // namespace
+ModuleResult SyncDecodeWasmModule(Isolate* isolate, const byte* module_start,
+                                  const byte* module_end, bool verify_functions,
+                                  ModuleOrigin origin) {
+  return DecodeWasmModule(isolate, module_start, module_end, verify_functions,
+                          origin, isolate->counters(), true);
+}
 
-ModuleResult DecodeWasmModule(Isolate* isolate, const byte* module_start,
-                              const byte* module_end, bool verify_functions,
-                              ModuleOrigin origin, bool is_sync) {
-  if (is_sync) {
-    // TODO(karlschimpf): Make this work when asynchronous.
-    // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-    auto counter = origin == kWasmOrigin
-                       ? isolate->counters()->wasm_decode_wasm_module_time()
-                       : isolate->counters()->wasm_decode_asm_module_time();
-    HistogramTimerScope wasm_decode_module_time_scope(counter);
-    return DecodeWasmModuleInternal(isolate, module_start, module_end,
-                                    verify_functions, origin, true);
-  }
-  return DecodeWasmModuleInternal(isolate, module_start, module_end,
-                                  verify_functions, origin, false);
+ModuleResult AsyncDecodeWasmModule(Isolate* isolate, const byte* module_start,
+                                   const byte* module_end,
+                                   bool verify_functions, ModuleOrigin origin,
+                                   Counters* async_counters) {
+  return DecodeWasmModule(isolate, module_start, module_end, verify_functions,
+                          origin, async_counters, false);
 }
 
 FunctionSig* DecodeWasmSignatureForTesting(Zone* zone, const byte* start,
                                            const byte* end) {
   ModuleDecoder decoder(start, end, kWasmOrigin);
   return decoder.DecodeFunctionSignature(zone, start);
 }
 
 WasmInitExpr DecodeWasmInitExprForTesting(const byte* start, const byte* end) {
   AccountingAllocator allocator;
   ModuleDecoder decoder(start, end, kWasmOrigin);
   return decoder.DecodeInitExpr(start);
 }
 
 namespace {
 
-FunctionResult DecodeWasmFunctionInternal(Isolate* isolate, Zone* zone,
-                                          ModuleBytesEnv* module_env,
-                                          const byte* function_start,
-                                          const byte* function_end,
-                                          bool is_sync) {
+FunctionResult DecodeWasmFunction(Isolate* isolate, Zone* zone,
+                                  ModuleBytesEnv* module_env,
+                                  const byte* function_start,
+                                  const byte* function_end, Counters* counters,
+                                  bool is_sync) {
   size_t size = function_end - function_start;
+  bool is_wasm = module_env->module_env.is_wasm();
+  auto size_counter = is_wasm ? counters->wasm_wasm_function_size_bytes()
+                              : counters->wasm_asm_function_size_bytes();
+  size_counter->AddSample(static_cast<int>(size));
+  auto time_counter = is_wasm ? counters->wasm_decode_wasm_function_time()
+                              : counters->wasm_decode_asm_function_time();
+  TimedHistogramScope wasm_decode_function_time_scope(time_counter);
   if (function_start > function_end)
     return FunctionResult::Error("start > end");
   if (size > kV8MaxWasmFunctionSize)
     return FunctionResult::Error("size > maximum function size: %zu", size);
-  if (is_sync) {
-    // TODO(karlschimpf): Make this work when asynchronous.
-    // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-    bool is_wasm = module_env->module_env.is_wasm();
-    (is_wasm ? isolate->counters()->wasm_wasm_function_size_bytes()
-             : isolate->counters()->wasm_asm_function_size_bytes())
-        ->AddSample(static_cast<int>(size));
-  }
   ModuleDecoder decoder(function_start, function_end, kWasmOrigin);
   return decoder.DecodeSingleFunction(zone, module_env,
                                       base::make_unique<WasmFunction>());
 }
 
 }  // namespace
 
-FunctionResult DecodeWasmFunction(Isolate* isolate, Zone* zone,
-                                  ModuleBytesEnv* module_env,
-                                  const byte* function_start,
-                                  const byte* function_end, bool is_sync) {
-  if (is_sync) {
-    // TODO(karlschimpf): Make this work when asynchronous.
-    // https://bugs.chromium.org/p/v8/issues/detail?id=6361
-    size_t size = function_end - function_start;
-    bool is_wasm = module_env->module_env.is_wasm();
-    auto size_counter =
-        is_wasm ? isolate->counters()->wasm_wasm_function_size_bytes()
-                : isolate->counters()->wasm_asm_function_size_bytes();
-    size_counter->AddSample(static_cast<int>(size));
-    auto time_counter =
-        is_wasm ? isolate->counters()->wasm_decode_wasm_function_time()
-                : isolate->counters()->wasm_decode_asm_function_time();
-    HistogramTimerScope wasm_decode_function_time_scope(time_counter);
-    return DecodeWasmFunctionInternal(isolate, zone, module_env, function_start,
-                                      function_end, true);
-  }
-  return DecodeWasmFunctionInternal(isolate, zone, module_env, function_start,
-                                    function_end, false);
+FunctionResult SyncDecodeWasmFunction(Isolate* isolate, Zone* zone,
+                                      ModuleBytesEnv* module_env,
+                                      const byte* function_start,
+                                      const byte* function_end) {
+  return DecodeWasmFunction(isolate, zone, module_env, function_start,
+                            function_end, isolate->counters(), true);
+}
+
+FunctionResult AsyncDecodeWasmFunction(Isolate* isolate, Zone* zone,
+                                       ModuleBytesEnv* module_env,
+                                       const byte* function_start,
+                                       const byte* function_end,
+                                       Counters* async_counters) {
+  return DecodeWasmFunction(isolate, zone, module_env, function_start,
+                            function_end, async_counters, false);
 }
 
 AsmJsOffsetsResult DecodeAsmJsOffsets(const byte* tables_start,
                                       const byte* tables_end) {
   AsmJsOffsets table;
 
   Decoder decoder(tables_start, tables_end);
   uint32_t functions_count = decoder.consume_u32v("functions count");
   // Reserve space for the entries, taking care of invalid input.
   if (functions_count < static_cast<unsigned>(tables_end - tables_start)) {
@@ skipping 66 matching lines @@
                       {name_offset, name_length},
                       {payload_offset, payload_length}});
   }
 
   return result;
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8