evolution-data-server r9058 - branches/camel-db-summary/camel

[psankar svn gnome org]

Author: psankar
Date: Fri Jun 27 06:08:02 2008
New Revision: 9058
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9058&view=rev

Log:
Add timeout only on initialize


Modified:
   branches/camel-db-summary/camel/camel-db.c

Modified: branches/camel-db-summary/camel/camel-db.c
==============================================================================
--- branches/camel-db-summary/camel/camel-db.c	(original)
+++ branches/camel-db-summary/camel/camel-db.c	Fri Jun 27 06:08:02 2008
@@ -24,8 +24,7 @@
 	d(g_print("%s\n", stmt));
 
 	ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
-	if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
-		sqlite3_busy_timeout (db, CAMEL_DB_SLEEP_INTERVAL);
+	while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
 		ret = sqlite3_exec(db, stmt, 0, 0, &errmsg);
 	}
 
@@ -72,6 +71,8 @@
 	
 	//camel_db_command (cdb, "PRAGMA cache_size=100", NULL);
 	
+	sqlite3_busy_timeout (cdb->db, CAMEL_DB_SLEEP_INTERVAL);
+
 	return cdb;
 }
 
@@ -205,8 +206,7 @@
 	char *errmsg;
 
 	ret = sqlite3_exec(cdb->db, query, 0, 0, &errmsg);
-	if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
-		sqlite3_busy_timeout (cdb->db, CAMEL_DB_SLEEP_INTERVAL);
+	while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
 		ret = sqlite3_exec (cdb->db, query, 0, 0, &errmsg);
 	}
 
@@ -350,8 +350,7 @@
 		return TRUE;
 	
 	ret = sqlite3_exec(cdb->db, stmt, 0, 0, &errmsg);
-	if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED || ret == -1) {
-		sqlite3_busy_timeout (cdb->db, CAMEL_DB_SLEEP_INTERVAL);
+	while (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) {
 		ret = sqlite3_exec (cdb->db, stmt, 0, 0, &errmsg);
 	}