From: Junio C Hamano <gitster@pobox.com>
To: Kjetil Barvik <barvik@broadpark.no>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC v2 2/3] make USE_NSEC work as expected
Date: Fri, 20 Feb 2009 00:35:35 -0800 [thread overview]
Message-ID: <7vab8hfqug.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: 24cefa55a62e2c898f9bd75ff7a6fe8e70836cf0.1235071656.git.barvik@broadpark.no
Kjetil Barvik <barvik@broadpark.no> writes:
> diff --git a/read-cache.c b/read-cache.c
> index 940ec76..ca4bec2 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -67,8 +67,15 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
> */
> void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
> {
> - ce->ce_ctime = st->st_ctime;
> - ce->ce_mtime = st->st_mtime;
> + ce->ce_ctime.sec = (unsigned int)st->st_ctime;
> + ce->ce_mtime.sec = (unsigned int)st->st_mtime;
> +#ifdef USE_NSEC
> + ce->ce_ctime.nsec = (unsigned int)st->st_ctim.tv_nsec;
> + ce->ce_mtime.nsec = (unsigned int)st->st_mtim.tv_nsec;
> +#else
> + ce->ce_ctime.nsec = 0;
> + ce->ce_mtime.nsec = 0;
> +#endif
How does this affect a use case where the same index file used with two
instances of git (one compiled with and another without USE_NSEC)?
> @@ -232,8 +246,16 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
> static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
> {
> return (!S_ISGITLINK(ce->ce_mode) &&
> - istate->timestamp &&
> - ((unsigned int)istate->timestamp) <= ce->ce_mtime);
> + istate->timestamp.sec &&
> +#ifdef USE_NSEC
> + /* nanosecond timestamped files can also be racy! */
Amusing ;-)
> diff --git a/unpack-trees.c b/unpack-trees.c
> index e547282..44714cc 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -380,8 +380,12 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
>
> memset(&o->result, 0, sizeof(o->result));
> o->result.initialized = 1;
> - if (o->src_index)
> - o->result.timestamp = o->src_index->timestamp;
> + if (o->src_index) {
> + o->result.timestamp.sec = o->src_index->timestamp.sec;
> +#ifdef USE_NSEC
> + o->result.timestamp.nsec = o->src_index->timestamp.nsec;
> +#endif
> + }
Do we need this hunk?
next prev parent reply other threads:[~2009-02-20 8:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 20:08 [PATCH/RFC v2 0/3] git checkout optimisation - part 3 Kjetil Barvik
2009-02-19 20:08 ` [PATCH/RFC v2 1/3] fix compile error when USE_NSEC is defined Kjetil Barvik
2009-02-19 20:08 ` [PATCH/RFC v2 2/3] make USE_NSEC work as expected Kjetil Barvik
2009-02-20 8:35 ` Junio C Hamano [this message]
2009-02-20 10:07 ` Kjetil Barvik
2009-02-21 5:42 ` Junio C Hamano
2009-02-19 20:08 ` [PATCH/RFC v2 3/3] verify_uptodate(): add ce_uptodate(ce) test Kjetil Barvik
2009-02-20 8:35 ` [PATCH/RFC v2 0/3] git checkout optimisation - part 3 Junio C Hamano
2009-02-20 9:03 ` Kjetil Barvik
2009-02-20 9:26 ` Sverre Rabbelier
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=7vab8hfqug.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=barvik@broadpark.no \
--cc=git@vger.kernel.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.
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).