From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Re: zsh got stuck without any message because of history lock file
Date: Thu, 24 Apr 2014 22:02:32 -0700 [thread overview]
Message-ID: <140424220232.ZM11424@torch.brasslantern.com> (raw)
In-Reply-To: <140424100228.ZM10689@torch.brasslantern.com>
On Apr 24, 10:02am, Bart Schaefer wrote:
}
} The way the code is currently written the shell will wait until 10
} seconds after the modification time stamp of the file. If for some
} reason the time stamp is wrong (clocks out of sync with NFS server,
} for example) then it may end up waiting for longer.
So ... here is a patch that checks for future timestamps. If it finds
one, it leaves errno set to EEXIST, which results in:
zsh: locking failed for /home/schaefer/.zhistory: file exists
This isn't perfect, but at least it provides a clue.
There's a controversial bit in this patch: It appears HIST_FCNTL_LOCK
may have been broken ever since workers/28047 in 2010. That patch
changed flockhistfile() [which is misnamed, it uses fcntl] to return 0
on success, but then also this:
ret = flockhistfile(fn, keep_trying);
if (ret)
return ret;
That means that we only stop when flockhistfile() FAILS. On success,
we go on and lock with BOTH fcntl AND a .LOCK file. This completely
contradicts the documentation claim that "this may provide better
performance." So the second hunk below makes flockhistfile() the
only lock applied when HIST_FCNTL_LOCK is set.
However, this would mean that every zsh that is accessing the same
HISTFILE has to be using the same locking options. Is that OK?
diff --git a/Src/hist.c b/Src/hist.c
index 1624912..1182994 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2720,6 +2720,25 @@ savehistfile(char *fn, int err, int writeflags)
static int lockhistct;
+static int
+checklocktime(char *lockfile, time_t then)
+{
+ time_t now = time(NULL);
+
+ if (now + 10 < then) {
+ /* File is more than 10 seconds in the future? */
+ errno = EEXIST;
+ return -1;
+ }
+
+ if (now - then < 10)
+ sleep(1);
+ else
+ unlink(lockfile);
+
+ return 0;
+}
+
/*
* Lock history file. Return 0 on success, 1 on failure to lock this
* time, 2 on permanent failure (e.g. permission).
@@ -2737,9 +2756,7 @@ lockhistfile(char *fn, int keep_trying)
#ifdef HAVE_FCNTL_H
if (isset(HISTFCNTLLOCK) && flock_fd < 0) {
- ret = flockhistfile(fn, keep_trying);
- if (ret)
- return ret;
+ return flockhistfile(fn, keep_trying);
}
#endif
@@ -2776,10 +2793,10 @@ lockhistfile(char *fn, int keep_trying)
continue;
break;
}
- if (time(NULL) - sb.st_mtime < 10)
- sleep(1);
- else
- unlink(lockfile);
+ if (checklocktime(lockfile, sb.st_mtime) < 0) {
+ ret = 1;
+ break;
+ }
}
if (fd < 0)
lockhistct--;
@@ -2804,10 +2821,10 @@ lockhistfile(char *fn, int keep_trying)
continue;
ret = 2;
} else {
- if (time(NULL) - sb.st_mtime < 10)
- sleep(1);
- else
- unlink(lockfile);
+ if (checklocktime(lockfile, sb.st_mtime) < 0) {
+ ret = 1;
+ break;
+ }
continue;
}
lockhistct--;
@@ -2832,10 +2849,10 @@ lockhistfile(char *fn, int keep_trying)
ret = 2;
break;
}
- if (time(NULL) - sb.st_mtime < 10)
- sleep(1);
- else
- unlink(lockfile);
+ if (checklocktime(lockfile, sb.st_mtime) < 0) {
+ ret = 1;
+ break;
+ }
}
if (fd < 0)
lockhistct--;
next prev parent reply other threads:[~2014-04-25 5:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 16:48 Andreas
2014-04-24 17:02 ` Bart Schaefer
2014-04-25 5:02 ` Bart Schaefer [this message]
2014-04-25 8:35 ` Peter Stephenson
2014-04-25 15:26 ` Bart Schaefer
2014-04-25 15:53 ` Bart Schaefer
2014-06-26 20:46 ` Mikael Magnusson
2014-09-06 9:03 ` Mikael Magnusson
2014-09-06 18:51 ` Bart Schaefer
2014-04-24 17:58 ` Andreas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=140424220232.ZM11424@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).