cygwin: Use native Win32 API for stat
lstat/stat functions in Cygwin are very slow, because they try to emulate some *nix things that Git does not actually need. This patch adds Win32 specific implementation of these functions for Cygwin. This implementation handles most situation directly but in some rare cases it falls back on the implementation provided for Cygwin. This is necessary for two reasons: - Cygwin has its own file hierarchy, so absolute paths used in Cygwin is not suitable to be used Win32 API. cygwin_conv_to_win32_path can not be used because it automatically dereference Cygwin symbol links, also it causes extra syscall. Fortunately Git rarely use absolute paths, so we always use Cygwin implementation for absolute paths. - Support of symbol links. Cygwin stores symbol links as ordinary using one of two possible formats. Therefore, the fast implementation falls back to Cygwin functions if it detects potential use of symbol links. The speed of this implementation should be the same as mingw_lstat for common cases, but it is considerable slower when the specified file name does not exist. Despite all efforts to make the fast implementation as robust as possible, it may not work well for some very rare situations. I am aware only one situation: use Cygwin mount to bind unrelated paths inside repository together. Therefore, the core.ignoreCygwinFSTricks configuration option is provided, which controls whether native or Cygwin version of stat is used. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Dmitry Potapov committed
Sep 30, 2008 at 17:53 UTC
adbc0b6b6e57c11ca49779d01f549260a920a97d
5 files changed
+150
Documentation/config.txt
+9
@@ -117,6 +117,15 @@ core.fileMode::
117
the working copy are ignored; useful on broken filesystems like FAT.
118
See linkgit:git-update-index[1]. True by default.
119
120
+core.ignoreCygwinFSTricks::
121
+ This option is only used by Cygwin implementation of Git. If false,
122
+ the Cygwin stat() and lstat() functions are used. This may be useful
123
+ if your repository consists of a few separate directories joined in
124
+ one hierarchy using Cygwin mount. If true, Git uses native Win32 API
125
+ whenever it is possible and falls back to Cygwin functions only to
126
+ handle symbol links. The native mode is more than twice faster than
127
+ normal Cygwin l/stat() functions. True by default.
128
+
129
core.trustctime::
130
If false, the ctime differences between the index and the
131
working copy are ignored; useful when the inode change time
Makefile
+4
@@ -346,6 +346,7 @@ LIB_H += cache.h
346
LIB_H += cache-tree.h
347
LIB_H += commit.h
348
LIB_H += compat/mingw.h
349
+LIB_H += compat/cygwin.h
350
LIB_H += csum-file.h
351
LIB_H += decorate.h
352
LIB_H += delta.h
@@ -748,6 +749,9 @@ ifeq ($(uname_S),HP-UX)
749
NO_SYS_SELECT_H = YesPlease
750
SNPRINTF_RETURNS_BOGUS = YesPlease
751
endif
752
+ifneq (,$(findstring CYGWIN,$(uname_S)))
753
+ COMPAT_OBJS += compat/cygwin.o
754
+endif
755
ifneq (,$(findstring MINGW,$(uname_S)))
756
NO_MMAP = YesPlease
757
NO_PREAD = YesPlease
compat/cygwin.c
new
+127
@@ -0,0 +1,127 @@
1
+#define WIN32_LEAN_AND_MEAN
2
+#include "../git-compat-util.h"
3
+#include "win32.h"
4
+#include "../cache.h" /* to read configuration */
5
+
6
+static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
7
+{
8
+ long long winTime = ((long long)ft->dwHighDateTime << 32) +
9
+ ft->dwLowDateTime;
10
+ winTime -= 116444736000000000LL; /* Windows to Unix Epoch conversion */
11
+ /* convert 100-nsecond interval to seconds and nanoseconds */
12
+ ts->tv_sec = (time_t)(winTime/10000000);
13
+ ts->tv_nsec = (long)(winTime - ts->tv_sec*10000000LL) * 100;
14
+}
15
+
16
+#define size_to_blocks(s) (((s)+511)/512)
17
+
18
+/* do_stat is a common implementation for cygwin_lstat and cygwin_stat.
19
+ *
20
+ * To simplify its logic, in the case of cygwin symlinks, this implementation
21
+ * falls back to the cygwin version of stat/lstat, which is provided as the
22
+ * last argument.
23
+ */
24
+static int do_stat(const char *file_name, struct stat *buf, stat_fn_t cygstat)
25
+{
26
+ WIN32_FILE_ATTRIBUTE_DATA fdata;
27
+
28
+ if (file_name[0] == '/')
29
+ return cygstat (file_name, buf);
30
+
31
+ if (!(errno = get_file_attr(file_name, &fdata))) {
32
+ /*
33
+ * If the system attribute is set and it is not a directory then
34
+ * it could be a symbol link created in the nowinsymlinks mode.
35
+ * Normally, Cygwin works in the winsymlinks mode, so this situation
36
+ * is very unlikely. For the sake of simplicity of our code, let's
37
+ * Cygwin to handle it.
38
+ */
39
+ if ((fdata.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) &&
40
+ !(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
41
+ return cygstat(file_name, buf);
42
+
43
+ /* fill out the stat structure */
44
+ buf->st_dev = buf->st_rdev = 0; /* not used by Git */
45
+ buf->st_ino = 0;
46
+ buf->st_mode = file_attr_to_st_mode(fdata.dwFileAttributes);
47
+ buf->st_nlink = 1;
48
+ buf->st_uid = buf->st_gid = 0;
49
+#ifdef __CYGWIN_USE_BIG_TYPES__
50
+ buf->st_size = ((_off64_t)fdata.nFileSizeHigh << 32) +
51
+ fdata.nFileSizeLow;
52
+#else
53
+ buf->st_size = (off_t)fdata.nFileSizeLow;
54
+#endif
55
+ buf->st_blocks = size_to_blocks(buf->st_size);
56
+ filetime_to_timespec(&fdata.ftLastAccessTime, &buf->st_atim);
57
+ filetime_to_timespec(&fdata.ftLastWriteTime, &buf->st_mtim);
58
+ filetime_to_timespec(&fdata.ftCreationTime, &buf->st_ctim);
59
+ return 0;
60
+ } else if (errno == ENOENT) {
61
+ /*
62
+ * In the winsymlinks mode (which is the default), Cygwin
63
+ * emulates symbol links using Windows shortcut files. These
64
+ * files are formed by adding .lnk extension. So, if we have
65
+ * not found the specified file name, it could be that it is
66
+ * a symbol link. Let's Cygwin to deal with that.
67
+ */
68
+ return cygstat(file_name, buf);
69
+ }
70
+ return -1;
71
+}
72
+
73
+/* We provide our own lstat/stat functions, since the provided Cygwin versions
74
+ * of these functions are too slow. These stat functions are tailored for Git's
75
+ * usage, and therefore they are not meant to be complete and correct emulation
76
+ * of lstat/stat functionality.
77
+ */
78
+static int cygwin_lstat(const char *path, struct stat *buf)
79
+{
80
+ return do_stat(path, buf, lstat);
81
+}
82
+
83
+static int cygwin_stat(const char *path, struct stat *buf)
84
+{
85
+ return do_stat(path, buf, stat);
86
+}
87
+
88
+
89
+/*
90
+ * At start up, we are trying to determine whether Win32 API or cygwin stat
91
+ * functions should be used. The choice is determined by core.ignorecygwinfstricks.
92
+ * Reading this option is not always possible immediately as git_dir may be
93
+ * not be set yet. So until it is set, use cygwin lstat/stat functions.
94
+ */
95
+static int native_stat = 1;
96
+
97
+static int git_cygwin_config(const char *var, const char *value, void *cb)
98
+{
99
+ if (!strcmp(var, "core.ignorecygwinfstricks"))
100
+ native_stat = git_config_bool(var, value);
101
+ return 0;
102
+}
103
+
104
+static int init_stat(void)
105
+{
106
+ if (have_git_dir()) {
107
+ git_config(git_cygwin_config, NULL);
108
+ cygwin_stat_fn = native_stat ? cygwin_stat : stat;
109
+ cygwin_lstat_fn = native_stat ? cygwin_lstat : lstat;
110
+ return 0;
111
+ }
112
+ return 1;
113
+}
114
+
115
+static int cygwin_stat_stub(const char *file_name, struct stat *buf)
116
+{
117
+ return (init_stat() ? stat : *cygwin_stat_fn)(file_name, buf);
118
+}
119
+
120
+static int cygwin_lstat_stub(const char *file_name, struct stat *buf)
121
+{
122
+ return (init_stat() ? lstat : *cygwin_lstat_fn)(file_name, buf);
123
+}
124
+
125
+stat_fn_t cygwin_stat_fn = cygwin_stat_stub;
126
+stat_fn_t cygwin_lstat_fn = cygwin_lstat_stub;
127
+
compat/cygwin.h
new
+9
@@ -0,0 +1,9 @@
1
+#include <sys/types.h>
2
+#include <sys/stat.h>
3
+
4
+typedef int (*stat_fn_t)(const char*, struct stat*);
5
+extern stat_fn_t cygwin_stat_fn;
6
+extern stat_fn_t cygwin_lstat_fn;
7
+
8
+#define stat(path, buf) (*cygwin_stat_fn)(path, buf)
9
+#define lstat(path, buf) (*cygwin_lstat_fn)(path, buf)
git-compat-util.h
+1
@@ -85,6 +85,7 @@
85
#undef _XOPEN_SOURCE
86
#include <grp.h>
87
#define _XOPEN_SOURCE 600
88
+#include "compat/cygwin.h"
89
#else
90
#undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
91
#include <grp.h>