linux: call PR_Init on UI thread

base/nss_init.cc

-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.

[wtc, 2009/09/02 01:17:17]

This should be 2008-2009.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/nss_init.h"
 
 #include <dlfcn.h>
 #include <nss.h>
 #include <plarena.h>
 #include <prerror.h>
 #include <prinit.h>
@@ skipping 37 matching lines @@
   SECMODModule *root = SECMOD_LoadUserModule(modparams, NULL, PR_FALSE);
   if (root)
     return root;
 
   // Aw, snap.  Can't find/load root cert shared library.
   // This will make it hard to talk to anybody via https.
   NOTREACHED();
   return NULL;
 }
 
+// A singleton to initialize/deinitialize NSPR.
+// Separate from the NSS singleton because we initialize it on the UI thread.

[wtc, 2009/09/02 01:17:17]

Nit: it => NSPR (otherwise it's not clear what "it" refers to)

Let's change "UI thread" to "main thread".

+class NSPRInitSingleton {
+ public:
+  NSPRInitSingleton() {
+    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
+  }
+
+  ~NSPRInitSingleton() {
+    PRStatus prstatus = PR_Cleanup();
+    if (prstatus != PR_SUCCESS) {
+      LOG(ERROR) << "PR_Cleanup failed; "
+        "Is NSPR getting destroyed on wrong thread?";

[wtc, 2009/09/02 01:17:17]

Since Singleton destructors run on the main thread, the
question should be "Is NSPR getting initialized on the
wrong thread?" or "Was NSPR initialized on the wrong thread?"
(not sure about the tense/grammar :-))

+    }
+  }
+};
+
 class NSSInitSingleton {
  public:
   NSSInitSingleton() {
     SECStatus status;

[wtc, 2009/09/02 01:17:17]

We should call EnsureNSPRInit here, so that the unit tests,
etc. will continue to call PR_Cleanup.

     std::string database_dir = GetDefaultConfigDirectory();
     if (!database_dir.empty()) {
       // Initialize with a persistant database (~/.pki/nssdb).
       // Use "sql:" which can be shared by multiple processes safely.
       status = NSS_InitReadWrite(
           StringPrintf("sql:%s", database_dir.c_str()).c_str());
     } else {
       LOG(WARNING) << "Initialize NSS without using a persistent database "
                    << "(~/.pki/nssdb).";
       status = NSS_NoDB_Init(".");
@@ skipping 59 matching lines @@
 
     SECStatus status = NSS_Shutdown();
     if (status != SECSuccess) {
       // We LOG(INFO) because this failure is relatively harmless
       // (leaking, but we're shutting down anyway).
       LOG(INFO) << "NSS_Shutdown failed; see "
                    "http://code.google.com/p/chromium/issues/detail?id=4609";
     }
 
     PL_ArenaFinish();
-
-    PRStatus prstatus = PR_Cleanup();
-    if (prstatus != PR_SUCCESS) {
-      // We LOG(ERROR) here because this failure is bad: it indicates
-      // NSPR isn't initialized and cleaned up on the same thread.
-      LOG(ERROR) << "PR_Cleanup failed; see "
-                    "http://code.google.com/p/chromium/issues/detail?id=18410";
-    }
   }
 
  private:
   SECMODModule *root_;
 };
 
 }  // namespace
 
 namespace base {
 
+void EnsureNSPRInit() {
+  Singleton<NSPRInitSingleton>::get();
+}
+
 void EnsureNSSInit() {
   Singleton<NSSInitSingleton>::get();
 }
 
 }  // namespace base