From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-users-return-23674-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id a69f7ac3 for ; Sun, 23 Sep 2018 15:26:40 +0000 (UTC) Received: (qmail 20426 invoked by alias); 23 Sep 2018 15:26:27 -0000 Mailing-List: contact zsh-users-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Users List List-Post: List-Help: List-Unsubscribe: X-Seq: 23674 Received: (qmail 1629 invoked by uid 1010); 23 Sep 2018 15:26:27 -0000 X-Qmail-Scanner-Diagnostics: from mail-pf1-f178.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.210.178):SA:0(-1.6/5.0):. Processed in 2.729819 secs); 23 Sep 2018 15:26:27 -0000 X-Envelope-From: lilydjwg@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:disposition-notification-to :user-agent; bh=2g/g89XxWV5B81heDDVb3gvWPC3fQla2QUUAkz8vPN0=; b=G/+vKlSwt3hF6VhkO7I6+4D3LmjcMLV+3J6dVK7HVj9Jf1oHN6dJDa/e+NaGnJ11hd KcHjCWayxMAsq+rJeFGkF/ntx/7w/N9ZFI69eQC1i4vdXSxqS+gpAkM1FNDpAl+Tab3y vxCzRZM7zFGsi8EomLrjblzgkEX4aQH3RdgJark/lqWYSDlzemanYLuNt6/kxsyTnUr4 4fykMhET9g62rfqRPpiCTSYQAOJGK3rDTYEQvlr2v4tXNBryJYqD60RL37ZBvGyx3Hwi DxlDV1XEsb9Qu6pVeh+qgYfMpqZXfUdAqJ/pQPuUWUPBqAPM1F1D8HMEyLg+ldPbSRMJ 8IUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to :disposition-notification-to:user-agent; bh=2g/g89XxWV5B81heDDVb3gvWPC3fQla2QUUAkz8vPN0=; b=YtKixI/JhHQ5ZZWICNL22wz+K9C40nEioUIW2YC3ZdpK0G6fyM0nDijdPnr5OEfsmp +fpfSOlpWmhSzaM1jUhIFAahUGA3/pgyl4bVqs3v8/O0J0dwlQpK49FC+ERg3clU6nlg 4soBQHHPpPVDHhD0pLqv356ehHDB0z3B57TyN72lmyvV2TsW8anglpxisPzbH5g6fiVH aGuaC48+jX6ZFPGEaWcv4ZbOl/d+B5HTjx8k/UYF/RWeM19Y+DccXPWXlOxdlGZhXy5r O/m7oWmJ7HvKhS4FeSTrhqxSsMa4T2elmkGrmcFlZ5+RnlDudDSD/bgsyKG6H8uRdjCv PnKg== X-Gm-Message-State: ABuFfohjlH+JLAxmhgyXwow0VMR7+5k7oVhKFbVleJlJTILPXVUWJTrS a1Om7cWNDF3RH1CTyemdL848UT7KSuY= X-Google-Smtp-Source: ACcGV62wOVhwfzyXwyhiVM+Ys0GTAYTf+UspAId+J8zlZkg62Q1k2MxbGdFIzM9B/KP5No5rSsXm0A== X-Received: by 2002:a63:5fc5:: with SMTP id t188-v6mr5866152pgb.346.1537716381724; Sun, 23 Sep 2018 08:26:21 -0700 (PDT) Date: Sun, 23 Sep 2018 23:25:46 +0800 From: lilydjwg To: Daniel Shahaf Cc: zsh-users@zsh.org Subject: Re: No fsync on history file? I lost my history Message-ID: <20180923152546.GA6201@lilyforest.localdomain> References: <20180923085246.GA19251@lilyforest.localdomain> <1537709747.103981.1517680056.72C7A43E@webmail.messagingengine.com> <20180923142255.GA4931@lilyforest.localdomain> <1537714011.118073.1517716184.0B2E8824@webmail.messagingengine.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="2fHTh5uZTiUOsy+g" Content-Disposition: inline In-Reply-To: <1537714011.118073.1517716184.0B2E8824@webmail.messagingengine.com> User-Agent: Mutt/1.10.1 (2018-07-13) --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="0001-Call-fsync-after-writing-out-new-histfile.patch" >From 3c6c07733f12176c737d1f610f0dceafd07437df Mon Sep 17 00:00:00 2001 From: lilydjwg 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) { -- 2.19.0 --2fHTh5uZTiUOsy+g--