X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ace576243765fb10ed37dc3ec4b040becd4c9542..f9917d386685c7f641d493dbc78eb3eb41fb24bd:/keydb_db4.c diff --git a/keydb_db4.c b/keydb_db4.c index e9dd509..6fbf9da 100644 --- a/keydb_db4.c +++ b/keydb_db4.c @@ -277,6 +277,7 @@ static void db4_initdb(bool readonly) int i = 0; u_int32_t flags = 0; struct stat statbuf; + int maxlocks; snprintf(buf, sizeof(buf) - 1, "%s/%s", config.db_dir, DB4_UPGRADE_FILE); @@ -314,7 +315,7 @@ static void db4_initdb(bool readonly) } } - dbconns = malloc(sizeof (DB *) * numdbs); + dbconns = calloc(numdbs, sizeof (DB *)); if (dbconns == NULL) { logthing(LOGTHING_CRITICAL, "Couldn't allocate memory for dbconns"); @@ -329,6 +330,17 @@ static void db4_initdb(bool readonly) } } + /* + * Up the number of locks we're allowed at once. We base this on + * the maximum number of keys we're going to return. + */ + maxlocks = config.maxkeys * 16; + if (maxlocks < 1000) { + maxlocks = 1000; + } + dbenv->set_lk_max_locks(dbenv, maxlocks); + dbenv->set_lk_max_objects(dbenv, maxlocks); + /* * Enable deadlock detection so that we don't block indefinitely on * anything. What we really want is simple 2 state locks, but I'm not @@ -690,6 +702,10 @@ static int db4_fetch_key_text(const char *search, } llfree(wordlist, NULL); wordlist = NULL; + + if (keylist.count > config.maxkeys) { + keylist.count = config.maxkeys; + } db4_starttrans(); for (i = 0; i < keylist.count; i++) {