Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:20
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined · Kjetil Barvik <hidden>
- 2016-06-15 · Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined · Johannes Sixt <hidden>
- 2016-06-15 · Re: [PATCH 2/2] better introduction of GIT with USE_NSEC defined · Johannes Sixt <hidden>
Johannes Sixt [off-list ref] writes:
quoted hunk
Yes, it breaks. You can test this on Linux by commenting out these two lines in git-compat-util.h:diff --git a/git-compat-util.h b/git-compat-util.h index dcf4127..ab4b615 100644 --- a/git-compat-util.h +++ b/git-compat-util.h@@ -44,8 +44,8 @@ #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ #endif #define _ALL_SOURCE 1 -#define _GNU_SOURCE 1 -#define _BSD_SOURCE 1 +/*#define _GNU_SOURCE 1*/ +/*#define _BSD_SOURCE 1*/ #include <unistd.h> #include <stdio.h>The result even passes the test suite (as long as I don't merge kb/checkout-optim, of course).
Isn't it better to separate "do we want to use that information if we can nanosecocond timestamps" and "is the API available for reading nanosecond timestamps" into separete switches, like this partial patch on top of the patch we are discussing, then? It is partial because it shows the way to convert only one call site as an example and of course you need to update the Makefile and autoconf.
diff --git a/git-compat-util.h b/git-compat-util.h
index 079cbe9..910aa03 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h@@ -384,4 +384,12 @@ void git_qsort(void *base, size_t nmemb, size_t size, # define FORCE_DIR_SET_GID 0 #endif +#ifdef HAS_NSEC +#define ST_CTIME_NSEC(st) ((unsigned ing)((st).st_ctim.tv_nsec)) +#define ST_MTIME_NSEC(st) ((unsigned ing)((st).st_mtim.tv_nsec)) +#else +#define ST_CTIME_NSEC(st) 0 +#define ST_MTIME_NSEC(st) 0 +#endif + #endif
diff --git a/read-cache.c b/read-cache.c
index 91f1d03..bb5cb2b 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -69,13 +69,8 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) { 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 + ce->ce_ctime.nsec = ST_CTIME_NSEC(*st); + ce->ce_mtime.nsec = ST_MTIME_NSEC(*st); ce->ce_dev = st->st_dev; ce->ce_ino = st->st_ino; ce->ce_uid = st->st_uid;