From: lilydjwg <lilydjwg@gmail.com>
To: Mikael Magnusson <mikachu@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: Mon, 24 Sep 2018 11:04:15 +0800 [thread overview]
Message-ID: <20180924030415.GB25143@lilyforest.localdomain> (raw)
In-Reply-To: <CAHYJk3SyM_KxzXaP=2e3bS5_=nh=9JtyCz6EAD1HnTG1LN_-tQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
On Sun, Sep 23, 2018 at 08:02:44PM +0200, Mikael Magnusson wrote:
> Please only do this for the tmpfile case, or interactive usage is
> going to be unbearable under load with incappendhistory.
Yes, indeeded. Updated.
--
Best regards,
lilydjwg
[-- Attachment #2: 0001-Call-fsync-after-writing-out-new-histfile.patch --]
[-- Type: text/plain, Size: 813 bytes --]
From 19cfeacfb8338f06577ac8f1d546f5b196903d4c 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 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Src/hist.c b/Src/hist.c
index dbdc1e4e5..64e5b4766 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -2933,6 +2933,12 @@ savehistfile(char *fn, int err, int writeflags)
lasthist.text = ztrdup(start);
}
}
+ if (tmpfile) {
+ 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) {
--
2.19.0
prev parent reply other threads:[~2018-09-24 3:05 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
2018-09-24 3:04 ` lilydjwg [this message]
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=20180924030415.GB25143@lilyforest.localdomain \
--to=lilydjwg@gmail.com \
--cc=d.s@daniel.shahaf.name \
--cc=mikachu@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).