From: Mikael Magnusson <mikachu@gmail.com>
To: lilydjwg <lilydjwg@gmail.com>
Cc: Daniel Shahaf <d.s@daniel.shahaf.name>, Zsh Users <zsh-users@zsh.org>
Subject: Re: No fsync on history file? I lost my history
Date: Sun, 23 Sep 2018 20:02:44 +0200 [thread overview]
Message-ID: <CAHYJk3SyM_KxzXaP=2e3bS5_=nh=9JtyCz6EAD1HnTG1LN_-tQ@mail.gmail.com> (raw)
In-Reply-To: <20180923152546.GA6201@lilyforest.localdomain>
On Sun, Sep 23, 2018 at 5:25 PM, lilydjwg <lilydjwg@gmail.com> wrote:
> I'm sending an updated patch.
>
> On Sun, Sep 23, 2018 at 02:46:51PM +0000, Daniel Shahaf wrote:
>> fsync() is in POSIX. I assume we can just call it, but if somebody complains
>> we'll need to use an HAVE_FSYNC guard.
>
> I don't know how to add a HAVE_FSYNC macro to the build system, sorry.
>
>> > +++ b/Src/hist.c
>> > @@ -2933,6 +2933,9 @@ savehistfile(char *fn, int err, int writeflags)
>> > lasthist.text = ztrdup(start);
>> > }
>> > }
>> > + fflush(out); /* need to flush before fsync */
>>
>> Isn't the fflush() on line 2927 sufficient? (Even if it isn't, I would have
>> expected a ret>=0 guard around this call.)
>
> It should call write(2) to write out the buffered data. Then the kernel
> can fsync the data to disk. A guard has been added.
>
>> > + if (fsync(fileno(out)) < 0 && ret >= 0)
>> > + ret = -1;
>>
>> fileno() can return -1.
>
> It shouldn't matter, fsync will return EBADF for -1. Other parts of the
> code don't check for this either, and I can't think a case when fileno
> would fail after so many successful I/O operations on it (corrupted memory?)
>
>> Shouldn't the ret>=0 check happen before the calls to fileno() and fsync()?
>
> Yes, I've changed that.
>
> --
> Best regards,
> lilydjwg
>
> From 3c6c07733f12176c737d1f610f0dceafd07437df Mon Sep 17 00:00:00 2001
> From: lilydjwg <lilydjwg@gmail.com>
> Date: Sun, 23 Sep 2018 22:12:56 +0800
> Subject: [PATCH] Call fsync after writing out new histfile
>
> to ensure the data is on disk before the rename in case of a system crash.
> ---
> Src/hist.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Src/hist.c b/Src/hist.c
> index dbdc1e4e5..d3370252d 100644
> --- a/Src/hist.c
> +++ b/Src/hist.c
> @@ -2933,6 +2933,10 @@ savehistfile(char *fn, int err, int writeflags)
> lasthist.text = ztrdup(start);
> }
> }
> + if (ret >= 0)
> + ret = fflush(out); /* need to flush before fsync */
> + if (ret >= 0 && fsync(fileno(out)) < 0)
> + ret = -1;
> if (fclose(out) < 0 && ret >= 0)
> ret = -1;
> if (ret >= 0) {
Please only do this for the tmpfile case, or interactive usage is
going to be unbearable under load with incappendhistory.
--
Mikael Magnusson
next prev parent reply other threads:[~2018-09-23 18:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-23 8:52 lilydjwg
2018-09-23 13:35 ` Daniel Shahaf
2018-09-23 14:22 ` lilydjwg
2018-09-23 14:46 ` Daniel Shahaf
2018-09-23 15:25 ` lilydjwg
2018-09-23 15:45 ` Daniel Shahaf
2018-09-23 19:40 ` Vincent Lefevre
2018-09-24 3:03 ` lilydjwg
2018-09-23 18:02 ` Mikael Magnusson [this message]
2018-09-24 3:04 ` lilydjwg
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='CAHYJk3SyM_KxzXaP=2e3bS5_=nh=9JtyCz6EAD1HnTG1LN_-tQ@mail.gmail.com' \
--to=mikachu@gmail.com \
--cc=d.s@daniel.shahaf.name \
--cc=lilydjwg@gmail.com \
--cc=zsh-users@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).