Cache Nacl Plugin private interface instead of calling GetnaclInterface on every process launch

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "native_client/src/trusted/plugin/plugin.h"
@@ skipping 104 matching lines @@
 
 // Up to 33 minutes.
 const int64_t kTimeLargeMin = 100;         // in ms
 const int64_t kTimeLargeMax = 2000000;     // in ms
 const uint32_t kTimeLargeBuckets = 100;
 
 const int64_t kSizeKBMin = 1;
 const int64_t kSizeKBMax = 512*1024;     // very large .nexe
 const uint32_t kSizeKBBuckets = 100;
 
-const PPB_NaCl_Private* GetNaclInterface() {
+const PPB_NaCl_Private* GetNaClInterface() {

[jvoung (off chromium), 2012/06/25 22:42:29]

Is there really a reason to still have this helper, if the preferred way is to
use the cached one?

[Derek Schuff, 2012/06/25 22:49:07]

I don't know if it's the preferred way, exactly. Currently the only use is for
process creation, but if I understand correctly, not much other than process
creation will work off the main thread. so maybe for other uses it would be
better just to use this?

On 2012/06/25 22:42:29, jvoung (chromium) wrote:

   pp::Module *module = pp::Module::Get();
   CHECK(module);
   return static_cast<const PPB_NaCl_Private*>(
       module->GetBrowserInterface(PPB_NACL_PRIVATE_INTERFACE));
 }
 
 const PPB_UMA_Private* GetUMAInterface() {
   pp::Module *module = pp::Module::Get();
   CHECK(module);
   return static_cast<const PPB_UMA_Private*>(
@@ skipping 479 matching lines @@
       new_service_runtime->Start(wrapper,
                                  error_info,
                                  manifest_base_url());
   PLUGIN_PRINTF(("Plugin::LoadNaClModuleCommon (service_runtime_started=%d)\n",
                  service_runtime_started));
   if (!service_runtime_started) {
     return false;
   }
 
   // Try to start the Chrome IPC-based proxy.
-  const PPB_NaCl_Private* ppb_nacl = GetNaclInterface();
-  if (ppb_nacl->StartPpapiProxy(pp_instance())) {
+  if (nacl_interface_->StartPpapiProxy(pp_instance())) {
     using_ipc_proxy_ = true;
     // We need to explicitly schedule this here. It is normally called in
     // response to starting the SRPC proxy.
     CHECK(init_done_cb.pp_completion_callback().func != NULL);
     PLUGIN_PRINTF(("Plugin::LoadNaClModuleCommon, started ipc proxy.\n"));
     pp::Module::Get()->core()->CallOnMainThread(0, init_done_cb, PP_OK);
   }
   return true;
 }
 
@@ skipping 246 matching lines @@
       nacl_ready_state_(UNSENT),
       nexe_error_reported_(false),
       wrapper_factory_(NULL),
       last_error_string_(""),
       ppapi_proxy_(NULL),
       enable_dev_interfaces_(false),
       init_time_(0),
       ready_time_(0),
       nexe_size_(0),
       time_of_last_progress_event_(0),
-      using_ipc_proxy_(false) {
+      using_ipc_proxy_(false),
+      nacl_interface_(NULL) {
   PLUGIN_PRINTF(("Plugin::Plugin (this=%p, pp_instance=%"
                  NACL_PRId32")\n", static_cast<void*>(this), pp_instance));
   callback_factory_.Initialize(this);
   nexe_downloader_.Initialize(this);
+  nacl_interface_ = GetNaClInterface();
+  CHECK(nacl_interface_ != NULL);

[dmichael (off chromium), 2012/06/25 22:42:34]

nit: In chromium, I'm used to just seeing/writing "CHECK(nacl_interface_);"

[Derek Schuff, 2012/06/25 22:49:07]

all the CHECKs in this particular file seem to use the != NULL form, so I
decided to follow those.

On 2012/06/25 22:42:34, dmichael wrote:

 }
 
 
 Plugin::~Plugin() {
   int64_t shutdown_start = NaClGetTimeOfDayMicroseconds();
 
   PLUGIN_PRINTF(("Plugin::~Plugin (this=%p, scriptable_plugin=%p)\n",
                  static_cast<void*>(this),
                  static_cast<void*>(scriptable_plugin())));
   // Destroy the coordinator while the rest of the data is still there
@@ skipping 1007 matching lines @@
                                           static_cast<uint32_t>(text.size()));
   const PPB_Console_Dev* console_interface =
       static_cast<const PPB_Console_Dev*>(
           module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE));
   console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str);
   var_interface->Release(prefix);
   var_interface->Release(str);
 }
 
 }  // namespace plugin