You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
3.4 KiB
79 lines
3.4 KiB
# HG changeset patch |
|
# User David Keeler <dkeeler@mozilla.com> |
|
# Date 1500978196 -7200 |
|
# Tue Jul 25 12:23:16 2017 +0200 |
|
# Node ID 9c94423e0669decabbb22b0d52ce31115c750265 |
|
# Parent f212be04f3d0265340bf5ae20ffbbccdda68b0aa |
|
bug 1382736 - Don't perform costly filesystem probes at startup r=ttaubert |
|
|
|
Differential Revision: https://nss-review.dev.mozaws.net/D374 |
|
|
|
diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c |
|
--- a/lib/softoken/sdb.c |
|
+++ b/lib/softoken/sdb.c |
|
@@ -1866,30 +1866,29 @@ sdb_init(char *dbname, char *table, sdbD |
|
* so we use it for the cache (see sdb_buildCache for how it's done).*/ |
|
|
|
/* |
|
- * we decide whether or not to use the cache based on the following input. |
|
- * |
|
- * NSS_SDB_USE_CACHE environment variable is non-existant or set to |
|
- * anything other than "no" or "yes" ("auto", for instance). |
|
- * This is the normal case. NSS will measure the performance of access |
|
- * to the temp database versus the access to the users passed in |
|
- * database location. If the temp database location is "significantly" |
|
- * faster we will use the cache. |
|
- * |
|
- * NSS_SDB_USE_CACHE environment variable is set to "no": cache will not |
|
- * be used. |
|
- * |
|
- * NSS_SDB_USE_CACHE environment variable is set to "yes": cache will |
|
- * always be used. |
|
- * |
|
- * It is expected that most applications would use the "auto" selection, |
|
- * the environment variable is primarily to simplify testing, and to |
|
- * correct potential corner cases where */ |
|
+ * we decide whether or not to use the cache based on the following input. |
|
+ * |
|
+ * NSS_SDB_USE_CACHE environment variable is set to anything other than |
|
+ * "yes" or "no" (for instance, "auto"): NSS will measure the performance |
|
+ * of access to the temp database versus the access to the user's |
|
+ * passed-in database location. If the temp database location is |
|
+ * "significantly" faster we will use the cache. |
|
+ * |
|
+ * NSS_SDB_USE_CACHE environment variable is nonexistent or set to "no": |
|
+ * cache will not be used. |
|
+ * |
|
+ * NSS_SDB_USE_CACHE environment variable is set to "yes": cache will |
|
+ * always be used. |
|
+ * |
|
+ * It is expected that most applications will not need this feature, and |
|
+ * thus it is disabled by default. |
|
+ */ |
|
|
|
env = PR_GetEnvSecure("NSS_SDB_USE_CACHE"); |
|
|
|
- if (env && PORT_Strcasecmp(env, "no") == 0) { |
|
+ if (!env || PORT_Strcasecmp(env, "no") == 0) { |
|
enableCache = PR_FALSE; |
|
- } else if (env && PORT_Strcasecmp(env, "yes") == 0) { |
|
+ } else if (PORT_Strcasecmp(env, "yes") == 0) { |
|
enableCache = PR_TRUE; |
|
} else { |
|
char *tempDir = NULL; |
|
@@ -2035,10 +2034,11 @@ s_open(const char *directory, const char |
|
{ |
|
char *env; |
|
env = PR_GetEnvSecure("NSS_SDB_USE_CACHE"); |
|
- /* If the environment variable is set to yes or no, sdb_init() will |
|
- * ignore the value of accessOps, and we can skip the measuring.*/ |
|
- if (!env || ((PORT_Strcasecmp(env, "no") != 0) && |
|
- (PORT_Strcasecmp(env, "yes") != 0))) { |
|
+ /* If the environment variable is undefined or set to yes or no, |
|
+ * sdb_init() will ignore the value of accessOps, and we can skip the |
|
+ * measuring.*/ |
|
+ if (env && PORT_Strcasecmp(env, "no") != 0 && |
|
+ PORT_Strcasecmp(env, "yes") != 0) { |
|
accessOps = sdb_measureAccess(directory); |
|
} |
|
}
|
|
|