Re: [PATCH 1/2] object-file: use futimes rather than utime
- From
- Neeraj Singh <nksingh85@gmail.com>
- Date
- Aug 25, 2021, 22:08 UTC
- Message-ID
- <CANQDOdfXBNABCgVsiqc2TJpctEgsJ2rJKHC5=u=q2P+mJWDYxQ@mail.gmail.com>
- In-Reply-To
- <nycvar.QRO.7.76.6.2108251530210.55@tvgsbejvaqbjf.bet>
On Wed, Aug 25, 2021 at 6:51 AM Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> If I were you, I would spell out "file descriptor" here.
Will do.
Show 44 quoted lines
> > diff --git a/compat/mingw.c b/compat/mingw.c
> > index 9e0cd1e097f..948f4c3428b 100644
> > --- a/compat/mingw.c
> > +++ b/compat/mingw.c
> > @@ -949,19 +949,40 @@ int mingw_fstat(int fd, struct stat *buf)
> > }
> > }
> >
> > -static inline void time_t_to_filetime(time_t t, FILETIME *ft)
> > +static inline void timeval_to_filetime(const struct timeval *t, FILETIME *ft)
> > {
> > - long long winTime = t * 10000000LL + 116444736000000000LL;
> > + long long winTime = t->tv_sec * 10000000LL + t->tv_usec * 10 + 116444736000000000LL;
>
> Technically, this is a change in behavior, right? We did not use to use
> nanosecond precision. But I don't think that we actually make use of this
> in this patch.
>
> > ft->dwLowDateTime = winTime;
> > ft->dwHighDateTime = winTime >> 32;
> > }
> >
> > -int mingw_utime (const char *file_name, const struct utimbuf *times)
> > +int mingw_futimes(int fd, const struct timeval times[2])
>
> At first, I wondered whether it would make sense to pass the access time
> and the modified time separately, as pointers. I don't think that we pass
> around arrays as function parameters in Git anywhere else.
>
> But then I realized that `futimes()` is available in this precise form on
> Linux and on the BSDs. Therefore, it is not up to us to decide the
> function's signature.
>
> However, now that I looked at the manual page, I noticed that this
> function is not part of any POSIX standard.
>
> Which makes me think that we will have to do a bit more than just define
> it on Windows: we will have to introduce a `Makefile` knob (just like you
> did with `HAVE_SYNC_FILE_RANGE` in patch 2/2) and set that specifically
> for Linux and the BSDs, and use `futimes()` only if it is available
> (otherwise fall back to `utime()`).
>
> Then, as a separate patch, we should introduce this Windows-specific shim
> and declare that it is available via `config.mak.uname`.Thanks for taking another look at the man pages. I looked again too and saw that futimens is part of POSIX.1-2008: https://pubs.opengroup.org/onlinepubs/9699919799/functions/futimens.html. If I switch to futimens and implement the Windows shim at the same time, is that sufficient to address your feedback? I'd rather not ifdef this one since the codeflow is quite different depending on the presence of the API.
Show 7 quoted lines
> > +} > > + > > +int mingw_utime (const char *file_name, const struct utimbuf *times) > > Please lose the space between the function name and the opening > parenthesis. I know, the preimage of this diff has it, but that was an > oversight and definitely disagrees with our current coding style.
Will do.
Show 26 quoted lines
>
> > +{
> > int fh, rc;
> > DWORD attrs;
> > wchar_t wfilename[MAX_PATH];
> > + struct timeval tvs[2];
> > +
> > if (xutftowcs_path(wfilename, file_name) < 0)
> > return -1;
> >
> > @@ -979,17 +1000,12 @@ int mingw_utime (const char *file_name, const struct utimbuf *times)
> > }
> >
> > if (times) {
> > - time_t_to_filetime(times->modtime, &mft);
> > - time_t_to_filetime(times->actime, &aft);
> > - } else {
> > - GetSystemTimeAsFileTime(&mft);
> > - aft = mft;
> > + memset(tvs, 0, sizeof(tvs));
> > + tvs[0].tv_sec = times->actime;
> > + tvs[1].tv_sec = times->modtime;
>
> It is too bad that we have to copy around those values just to convert
> them, but I cannot think of any better way, either. And it's not like
> we're in a hot loop: this code will be dominated by I/O anyways.Yeah, the cost of this is approximately 3-4 cycles (load-to-use latency), so no one will notice relative to the system call overhead.
Show 23 quoted lines
> > diff --git a/object-file.c b/object-file.c
> > index a8be8994814..607e9e2f80b 100644
> > --- a/object-file.c
> > +++ b/object-file.c
> > @@ -1860,12 +1860,13 @@ int hash_object_file(const struct git_hash_algo *algo, const void *buf,
> > }
> >
> > /* Finalize a file on disk, and close it. */
> > -static void close_loose_object(int fd)
> > +static int close_loose_object(int fd, const char *tmpfile, const char *filename)
> > {
> > if (fsync_object_files)
> > fsync_or_die(fd, "loose object file");
> > if (close(fd) != 0)
> > die_errno(_("error when closing loose object file"));
> > + return finalize_object_file(tmpfile, filename);
>
> While this is a clear change of behavior, this function has only one
> caller, and that caller is adjusted accordingly.
>
> Could you add this clarification of context to the commit message? I know
> it will help me in the future, when I have to get up to speed again by
> reading the commit history.How does the following revised wording sound?
```
object-file: use futimens rather than utime Make close_loose_object do all of the steps for syncing and correctly
naming a new loose object so that it can be reimplemented in the
upcoming bulk-fsync mode. Use futimens, which is available in POSIX.1-2008 to update the file
timestamps. This should be slightly faster than utime, since we have
a file descriptor already available. This change allows us to update
the time before closing, renaming, and potentially fsyincing the file
being refreshed. This code is currently only invoked by git-pack-objects
via force_object_loose.Implement a futimens shim for the Windows port of Git.
Signed-off-by: Neeraj Singh <neerajsi@microsoft.com> ```
Thanks for the detailed and quick feedback! -Neeraj