[dovecot-cvs] dovecot/src/lib-index mail-cache-private.h, 1.27, 1.28 mail-cache.c, 1.77, 1.78 mail-transaction-log.c, 1.106, 1.107

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv27670/lib-index

Modified Files:
	mail-cache-private.h mail-cache.c mail-transaction-log.c 
Log Message:
Removed immediate_stale_timeout and changed the stale_timeout behavior to
check both dotlock and the file it protects, and overwrite the lock file
whenever neither of them have been modified for stale_timeout seconds (ie.
also immediately if their timestamps are old enough).



Index: mail-cache-private.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-cache-private.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mail-cache-private.h	6 Jan 2006 14:21:21 -0000	1.27
+++ mail-cache-private.h	5 Feb 2006 12:46:08 -0000	1.28
@@ -31,7 +31,6 @@
 
 #define MAIL_CACHE_LOCK_TIMEOUT 120
 #define MAIL_CACHE_LOCK_CHANGE_TIMEOUT 60
-#define MAIL_CACHE_LOCK_IMMEDIATE_TIMEOUT (5*60)
 
 #define CACHE_RECORD(cache, offset) \
 	((const struct mail_cache_record *) \

Index: mail-cache.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-cache.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- mail-cache.c	14 Jan 2006 18:47:34 -0000	1.77
+++ mail-cache.c	5 Feb 2006 12:46:08 -0000	1.78
@@ -278,8 +278,6 @@
 
 	cache->dotlock_settings.timeout = MAIL_CACHE_LOCK_TIMEOUT;
 	cache->dotlock_settings.stale_timeout = MAIL_CACHE_LOCK_CHANGE_TIMEOUT;
-	cache->dotlock_settings.immediate_stale_timeout =
-		MAIL_CACHE_LOCK_IMMEDIATE_TIMEOUT;
 
 	if (!MAIL_INDEX_IS_IN_MEMORY(index)) {
 		if (index->mmap_disable || index->mmap_no_write)

Index: mail-transaction-log.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-transaction-log.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- mail-transaction-log.c	14 Jan 2006 18:47:35 -0000	1.106
+++ mail-transaction-log.c	5 Feb 2006 12:46:08 -0000	1.107
@@ -21,8 +21,7 @@
 
 /* this lock should never exist for a long time.. */
 #define LOG_DOTLOCK_TIMEOUT 60
-#define LOG_DOTLOCK_STALE_TIMEOUT 0
-#define LOG_DOTLOCK_IMMEDIATE_STALE_TIMEOUT 60
+#define LOG_DOTLOCK_STALE_TIMEOUT 60
 
 #define MAIL_TRANSACTION_LOG_SUFFIX ".log"
 #define LOG_NEW_DOTLOCK_SUFFIX ".newlock"
@@ -230,8 +229,6 @@
 
 	log->dotlock_settings.timeout = LOG_DOTLOCK_TIMEOUT;
 	log->dotlock_settings.stale_timeout = LOG_DOTLOCK_STALE_TIMEOUT;
-	log->dotlock_settings.immediate_stale_timeout =
-		LOG_DOTLOCK_IMMEDIATE_STALE_TIMEOUT;
 
 	log->new_dotlock_settings = log->dotlock_settings;
 	log->new_dotlock_settings.lock_suffix = LOG_NEW_DOTLOCK_SUFFIX;