Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6647:6dd5df1c1ec9 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If dotlock was less than 2 seconds old, we never read PID from it. Now it's read after 2 seconds.
author Timo Sirainen <tss@iki.fi>
date Sun, 28 Oct 2007 14:47:10 +0200
parents f3ca0b9e3628
children b2c14c07dcb2
files src/lib/file-dotlock.c
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/file-dotlock.c	Sun Oct 28 14:31:13 2007 +0200
+++ b/src/lib/file-dotlock.c	Sun Oct 28 14:47:10 2007 +0200
@@ -60,9 +60,12 @@
 	struct file_change_info lock_info;
 	struct file_change_info file_info;
 
-	bool have_pid, use_io_notify;
 	time_t last_pid_check;
 	time_t last_change;
+
+	unsigned int have_pid:1;
+	unsigned int pid_read:1;
+	unsigned int use_io_notify:1;
 };
 
 static struct dotlock *
@@ -171,23 +174,25 @@
 static int check_lock(time_t now, struct lock_info *lock_info)
 {
 	time_t stale_timeout = lock_info->set->stale_timeout;
-	pid_t pid;
+	pid_t pid = -1;
 	bool changed;
 	int ret;
 
 	if ((ret = update_lock_info(now, lock_info, &changed)) != 0)
 		return ret;
-	if (changed) {
+	if (changed || !lock_info->pid_read) {
 		/* either our first check or someone else got the lock file.
 		   if the dotlock was created only a couple of seconds ago,
 		   don't bother to read its PID. */
-		pid = lock_info->lock_info.mtime >=
-			now - STALE_PID_CHECK_SECS ? -1 :
-			read_local_pid(lock_info->lock_path);
+		if (lock_info->lock_info.mtime >= now - STALE_PID_CHECK_SECS)
+			lock_info->pid_read = FALSE;
+		else {
+			pid = read_local_pid(lock_info->lock_path);
+			lock_info->pid_read = TRUE;
+		}
 		lock_info->have_pid = pid != -1;
 	} else if (!lock_info->have_pid) {
 		/* no pid checking */
-		pid = -1;
 	} else {
 		if (lock_info->last_pid_check == now) {
 			/* we just checked the pid */