Pepper: Move more UMA stuff out of trusted plugin.

ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc

 // Copyright (c) 2012 The Chromium 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 "ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.h"
 
 #include <iterator>
 
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "ppapi/cpp/var.h"
@@ skipping 156 matching lines @@
   NaClSubprocess* llc_subprocess = plugin_->LoadHelperNaClModule(
       resources_->GetLlcUrl(), llc_file_handle, &error_info);
   if (llc_subprocess == NULL) {
     if (llc_file_handle != PP_kInvalidFileHandle)
       CloseFileHandle(llc_file_handle);
     TranslateFailed(PP_NACL_ERROR_PNACL_LLC_SETUP,
                     "Compile process could not be created: " +
                     error_info.message());
     return;
   }
-  core->CallOnMainThread(0,
-                         coordinator_->GetUMATimeCallback(
-                             "NaCl.Perf.PNaClLoadTime.LoadCompiler",
-                             NaClGetTimeOfDayMicroseconds() - llc_start_time),
-                         PP_OK);
+  GetNaClInterface()->LogTranslateTime(
+      "NaCl.Perf.PNaClLoadTime.LoadCompiler",
+      NaClGetTimeOfDayMicroseconds() - llc_start_time);
 
   {
     nacl::MutexLocker ml(&subprocess_mu_);
     // If we received a call to AbortSubprocesses() before we had a chance to
     // set llc_subprocess_, shut down and clean up the subprocess started here.
     if (subprocesses_aborted_) {
       llc_subprocess->service_runtime()->Shutdown();
       delete llc_subprocess;
       return;
     }
@@ skipping 102 matching lines @@
       // The error string is only present if the error was sent back from llc.
       TranslateFailed(PP_NACL_ERROR_PNACL_LLC_INTERNAL,
                       params.outs()[3]->arrays.str);
     } else {
       TranslateFailed(PP_NACL_ERROR_PNACL_LLC_INTERNAL,
                       "Compile StreamEnd internal error");
     }
     return;
   }
   compile_time_ = NaClGetTimeOfDayMicroseconds() - compile_start_time;
-  core->CallOnMainThread(0,
-                         coordinator_->GetUMATimeCallback(
-                             "NaCl.Perf.PNaClLoadTime.CompileTime",
-                             compile_time_),
-                         PP_OK);
+  GetNaClInterface()->LogTranslateTime("NaCl.Perf.PNaClLoadTime.CompileTime",
+                                       compile_time_);
 
   // Shut down the llc subprocess.
   NaClXMutexLock(&subprocess_mu_);
   llc_subprocess_active_ = false;
   llc_subprocess_.reset(NULL);
   NaClXMutexUnlock(&subprocess_mu_);
 
   if(!RunLdSubprocess()) {
     return;
   }
@@ skipping 12 matching lines @@
       TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
                       "Link process could not reset object file");
       return false;
     }
     ld_in_files.push_back((*obj_files_)[i]->read_wrapper());
   }
   for (; i < PnaclCoordinator::kMaxTranslatorObjectFiles; i++)
     ld_in_files.push_back(invalid_desc_wrapper_);
 
   nacl::DescWrapper* ld_out_file = nexe_file_->write_wrapper();
-  pp::Core* core = pp::Module::Get()->core();
   int64_t ld_start_time = NaClGetTimeOfDayMicroseconds();
   PP_FileHandle ld_file_handle = resources_->TakeLdFileHandle();
   // On success, ownership of ld_file_handle is transferred.
   nacl::scoped_ptr<NaClSubprocess> ld_subprocess(
       plugin_->LoadHelperNaClModule(resources_->GetLlcUrl(),
                                     ld_file_handle,
                                     &error_info));
   if (ld_subprocess.get() == NULL) {
     if (ld_file_handle != PP_kInvalidFileHandle)
       CloseFileHandle(ld_file_handle);
     TranslateFailed(PP_NACL_ERROR_PNACL_LD_SETUP,
                     "Link process could not be created: " +
                     error_info.message());
     return false;
   }
-  core->CallOnMainThread(0,
-                         coordinator_->GetUMATimeCallback(
-                             "NaCl.Perf.PNaClLoadTime.LoadLinker",
-                             NaClGetTimeOfDayMicroseconds() - ld_start_time),
-                         PP_OK);
-
+  GetNaClInterface()->LogTranslateTime(
+      "NaCl.Perf.PNaClLoadTime.LoadLinker",
+      NaClGetTimeOfDayMicroseconds() - ld_start_time);
   {
     nacl::MutexLocker ml(&subprocess_mu_);
     // If we received a call to AbortSubprocesses() before we had a chance to
     // set llc_subprocess_, shut down and clean up the subprocess started here.
     if (subprocesses_aborted_) {
       ld_subprocess->service_runtime()->Shutdown();
       return false;
     }
     DCHECK(ld_subprocess_.get() == NULL);
     ld_subprocess_.swap(ld_subprocess);
@@ skipping 22 matching lines @@
       ld_in_files[12]->desc(),
       ld_in_files[13]->desc(),
       ld_in_files[14]->desc(),
       ld_in_files[15]->desc(),
       ld_out_file->desc());
   if (!success) {
     TranslateFailed(PP_NACL_ERROR_PNACL_LD_INTERNAL,
                     "link failed.");
     return false;
   }
-  core->CallOnMainThread(0,
-                         coordinator_->GetUMATimeCallback(
-                             "NaCl.Perf.PNaClLoadTime.LinkTime",
-                             NaClGetTimeOfDayMicroseconds() - link_start_time),
-                         PP_OK);
+  GetNaClInterface()->LogTranslateTime(
+      "NaCl.Perf.PNaClLoadTime.LinkTime",
+      NaClGetTimeOfDayMicroseconds() - link_start_time);
   PLUGIN_PRINTF(("PnaclCoordinator: link (translator=%p) succeeded\n",
                  this));
   // Shut down the ld subprocess.
   NaClXMutexLock(&subprocess_mu_);
   ld_subprocess_active_ = false;
   ld_subprocess_.reset(NULL);
   NaClXMutexUnlock(&subprocess_mu_);
   return true;
 }
 
@@ skipping 38 matching lines @@
   AbortSubprocesses();
   if (translate_thread_ != NULL)
     NaClThreadJoin(translate_thread_.get());
   PLUGIN_PRINTF(("~PnaclTranslateThread joined\n"));
   NaClCondVarDtor(&buffer_cond_);
   NaClMutexDtor(&cond_mu_);
   NaClMutexDtor(&subprocess_mu_);
 }
 
 } // namespace plugin