From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:47:28 +0000 (+0000)
Subject: cscvs to tla changeset 59
X-Git-Tag: 0.1.2~2
X-Git-Url: https://the.earth.li/gitweb/?a=commitdiff_plain;h=0d38a62f4c8e92149a5daade98079fb7445b7a0b;p=onak.git

cscvs to tla changeset 59
Author: noodles
Date: 2003/02/15 13:53:34
Enable deadlock detection for the DB3 backend.
---

diff --git a/keydb_db3.c b/keydb_db3.c
index 2cb61aa..2197719 100644
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -118,15 +118,16 @@ void initdb(void)
 	}
 
 	/*
-	 * This is a bit of a kludge. Either we run a separate process for
-	 * deadlock detection or we do this every time we run. What we really
-	 * want to do is specify that our locks are exclusive locks when we
-	 * start to do an update.
+	 * 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
+	 * sure how to make the standard DB functions do that yet.
 	 */
-	ret = lock_detect(dbenv,
-			0, /* flags */
-			DB_LOCK_RANDOM,
-			NULL); /* If non null int* for number broken */
+	ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT);
+	if (ret != 0) {
+		logthing(LOGTHING_CRITICAL,
+			"db_env_create: %s", db_strerror(ret));
+		exit(1);
+	}
 
 	ret = dbenv->open(dbenv, config.db_dir,
 			DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK |