Add support for threadsafe completion callback factory.

ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h

 // 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.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_
 
 #include <set>
 #include <map>
 #include <vector>
@@ skipping 21 matching lines @@
 #include "ppapi/cpp/file_system.h"
 
 
 namespace plugin {
 
 class Manifest;
 class Plugin;
 class PnaclCoordinator;
 class PnaclTranslateThread;
 
-// A thread safe reference counting class Needed for CompletionCallbackFactory
-// in PnaclCoordinator.
-class PnaclRefCount {
- public:
-  PnaclRefCount() : ref_(0) { NaClXMutexCtor(&mu_); }
-  ~PnaclRefCount() { NaClMutexDtor(&mu_); }
-  int32_t AddRef() {
-    nacl::MutexLocker ml(&mu_);
-    return ++ref_;
-  }
-  int32_t Release() {
-    nacl::MutexLocker ml(&mu_);
-    return --ref_;
-  }
-
- private:
-  int32_t ref_;
-  struct NaClMutex mu_;
-};
-
 // A class invoked by Plugin to handle PNaCl client-side translation.
 // Usage:
 // (1) Invoke the factory method, e.g.,
 //     PnaclCoordinator* coord = BitcodeToNative(plugin,
 //                                               "http://foo.com/my.pexe",
 //                                               TranslateNotifyCallback);
 // (2) TranslateNotifyCallback gets invoked when translation is complete.
 //     If the translation was successful, the pp_error argument is PP_OK.
 //     Other values indicate errors.
 // (3) After finish_callback runs, get the file descriptor of the translated
@@ skipping 126 matching lines @@
 
   void TranslateFinished(int32_t pp_error);
   // Keeps track of the pp_error upon entry to TranslateFinished,
   // for inspection after cleanup.
   int32_t translate_finish_error_;
 
   // The plugin owning the nexe for which we are doing translation.
   Plugin* plugin_;
 
   pp::CompletionCallback translate_notify_callback_;
-  // PnaclRefCount is only needed to support file lookups.
   // TODO(sehr): remove this when file lookup is through ReverseService.

[Derek Schuff, 2012/07/10 20:31:54]

this comment goes with the previous comment that was removed. Maybe instead of
removing it, just say that thread safety is required to support file lookups.

[brettw, 2012/07/10 21:06:09]

Done.

   pp::CompletionCallbackFactory<PnaclCoordinator,
-                                PnaclRefCount> callback_factory_;
+                                pp::ThreadSafeThreadTraits> callback_factory_;
 
   // Nexe from the final native Link.
   nacl::scoped_ptr<nacl::DescWrapper> translated_fd_;
 
   // Translation creates local temporary files.
   nacl::scoped_ptr<pp::FileSystem> file_system_;
   // The manifest used by resource loading and llc's reverse service to look up
   // objects and libraries.
   nacl::scoped_ptr<const Manifest> manifest_;
   // TEMPORARY: ld needs to look up dynamic libraries in the nexe's manifest
@@ skipping 34 matching lines @@
   // Keep this last in declaration order to ensure the other variables
   // haven't been destroyed yet when its destructor runs.
   nacl::scoped_ptr<PnaclTranslateThread> translate_thread_;
 
 };
 
 //----------------------------------------------------------------------
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_