Commit Graph

126136 Commits

Author SHA1 Message Date
Johannes Schindelin
5f4b58c851 Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
fscache: add not-found directory cache to fscache
2021-11-09 18:44:01 -05:00
Johannes Schindelin
9433c26843 Merge branch 'fscache' 2021-11-09 18:44:01 -05:00
Johannes Schindelin
c1aec191ef fscache: add a test for the dir-not-found optimization
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Johannes Schindelin
15ed93a092 Merge branch 'ready-for-upstream'
This is the branch thicket of patches in Git for Windows that are
considered ready for upstream. To keep them in a ready-to-submit shape,
they are kept as close to the beginning of the branch thicket as
possible.
2021-11-09 18:43:59 -05:00
Karsten Blees
edf42e16df fscache: load directories only once
If multiple threads access a directory that is not yet in the cache, the
directory will be loaded by each thread. Only one of the results is added
to the cache, all others are leaked. This wastes performance and memory.

On cache miss, add a future object to the cache to indicate that the
directory is currently being loaded. Subsequent threads register themselves
with the future object and wait. When the first thread has loaded the
directory, it replaces the future object with the result and notifies
waiting threads.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-09 18:43:59 -05:00
Jeff Hostetler
73a246f93d fscache: remember not-found directories
Teach FSCACHE to remember "not found" directories.

This is a performance optimization.

FSCACHE is a performance optimization available for Windows.  It
intercepts Posix-style lstat() calls into an in-memory directory
using FindFirst/FindNext.  It improves performance on Windows by
catching the first lstat() call in a directory, using FindFirst/
FindNext to read the list of files (and attribute data) for the
entire directory into the cache, and short-cut subsequent lstat()
calls in the same directory.  This gives a major performance
boost on Windows.

However, it does not remember "not found" directories.  When STATUS
runs and there are missing directories, the lstat() interception
fails to find the parent directory and simply return ENOENT for the
file -- it does not remember that the FindFirst on the directory
failed. Thus subsequent lstat() calls in the same directory, each
re-attempt the FindFirst.  This completely defeats any performance
gains.

This can be seen by doing a sparse-checkout on a large repo and
then doing a read-tree to reset the skip-worktree bits and then
running status.

This change reduced status times for my very large repo by 60%.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Jeff Hostetler
c33902befc Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor 2021-11-09 18:43:59 -05:00
Karsten Blees
e16d865fcd mingw: add a cache below mingw's lstat and dirent implementations
Checking the work tree status is quite slow on Windows, due to slow
`lstat()` emulation (git calls `lstat()` once for each file in the
index). Windows operating system APIs seem to be much better at scanning
the status of entire directories than checking single files.

Add an `lstat()` implementation that uses a cache for lstat data. Cache
misses read the entire parent directory and add it to the cache.
Subsequent `lstat()` calls for the same directory are served directly
from the cache.

Also implement `opendir()`/`readdir()`/`closedir()` so that they create
and use directory listings in the cache.

The cache doesn't track file system changes and doesn't plug into any
modifying file APIs, so it has to be explicitly enabled for git functions
that don't modify the working copy.

Note: in an earlier version of this patch, the cache was always active and
tracked file system changes via ReadDirectoryChangesW. However, this was
much more complex and had negative impact on the performance of modifying
git commands such as 'git checkout'.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Jeff Hostetler
d7e2fc63fe fscache: add key for GIT_TRACE_FSCACHE
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Karsten Blees
324338b3bf add infrastructure for read-only file system level caches
Add a macro to mark code sections that only read from the file system,
along with a config option and documentation.

This facilitates implementation of relatively simple file system level
caches without the need to synchronize with the file system.

Enable read-only sections for 'git status' and preload_index.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-09 18:43:59 -05:00
Karsten Blees
0908386bf9 Win32: make the lstat implementation pluggable
Emulating the POSIX lstat API on Windows via GetFileAttributes[Ex] is quite
slow. Windows operating system APIs seem to be much better at scanning the
status of entire directories than checking single files. A caching
implementation may improve performance by bulk-reading entire directories
or reusing data obtained via opendir / readdir.

Make the lstat implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Karsten Blees
7d9cac18e8 mingw: make the dirent implementation pluggable
Emulating the POSIX `dirent` API on Windows via
`FindFirstFile()`/`FindNextFile()` is pretty staightforward, however,
most of the information provided in the `WIN32_FIND_DATA` structure is
thrown away in the process. A more sophisticated implementation may
cache this data, e.g. for later reuse in calls to `lstat()`.

Make the `dirent` implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Define a base DIR structure with pointers to `readdir()`/`closedir()`
that match the `opendir()` implementation (similar to vtable pointers in
Object-Oriented Programming). Define `readdir()`/`closedir()` so that
they call the function pointers in the `DIR` structure. This allows to
choose the `opendir()` implementation on a call-by-call basis.

Make the fixed-size `dirent.d_name` buffer a flex array, as `d_name` may
be implementation specific (e.g. a caching implementation may allocate a
`struct dirent` with _just_ the size needed to hold the `d_name` in
question).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Karsten Blees
1498784e70 Win32: dirent.c: Move opendir down
Move opendir down in preparation for the next patch.

Signed-off-by: Karsten Blees <blees@dcon.de>
2021-11-09 18:43:59 -05:00
Karsten Blees
517612830b Win32: make FILETIME conversion functions public
We will use them in the upcoming "FSCache" patches (to accelerate
sequential lstat() calls).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:59 -05:00
Johannes Schindelin
9167eff5ee Merge pull request #3456 from jeffhostetler/try-v4-fsmonitor-part5
FSMonitor: deepening a directory causes confusing events
2021-11-09 18:43:58 -05:00
Jeff Hostetler
73b5716f39 Merge branch 'try-v4-fsmonitor-part4' into try-v4-fsmonitor 2021-11-09 18:43:58 -05:00
Jeff Hostetler
0f5552e12b Merge branch 'try-v4-fsmonitor-part3' into try-v4-fsmonitor 2021-11-09 18:43:58 -05:00
Jeff Hostetler
8e54deeef4 Merge branch 'try-v4-fsmonitor-part2' into try-v4-fsmonitor 2021-11-09 18:43:58 -05:00
Johannes Schindelin
6b17a35da8 Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
2021-11-09 18:43:58 -05:00
Johannes Schindelin
5b28752bc8 Merge pull request #3398 from carenas/pthread-unistd
mingw: avoid fallback for {local,gm}time_r()
2021-11-09 18:43:58 -05:00
Johannes Schindelin
b106366d71 Merge pull request #3306 from PhilipOakley/vs-sln
Make Git for Windows start builds in modern Visual Studio
2021-11-09 18:43:58 -05:00
Johannes Schindelin
89bfe6948e Merge pull request #3349 from vdye/feature/ci-subtree-tests
Add `contrib/subtree` test execution to CI builds
2021-11-09 18:43:58 -05:00
Johannes Schindelin
0289397485 Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
http: Add support for enabling automatic sending of SSL client certificate
2021-11-09 18:43:58 -05:00
Johannes Schindelin
a448ca92a9 Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
Let the documentation reflect that there is no vs/master anymore
2021-11-09 18:43:57 -05:00
Johannes Schindelin
6128b88c91 Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
mingw: allow for longer paths in `parse_interpreter()`
2021-11-09 18:43:57 -05:00
Johannes Schindelin
ca82fd819b Merge pull request #3150 from dscho/ci-cache-vcpkg-artifacts-g4w
ci: cache vcpkg artifacts
2021-11-09 18:43:57 -05:00
Johannes Schindelin
72bedac2a1 Merge pull request #3327 from dennisameling/fix-host-cpu
cmake(): allow setting HOST_CPU for cross-compilation
2021-11-09 18:43:57 -05:00
Johannes Schindelin
f27f6e5ff2 Merge pull request #2915 from dennisameling/windows-arm64-support
Windows arm64 support
2021-11-09 18:43:57 -05:00
Johannes Schindelin
c75b6fa74c Merge pull request #2351 from PhilipOakley/vcpkg-tip
Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs
2021-11-09 18:43:57 -05:00
Johannes Schindelin
9b1559cc3c Merge pull request #2974 from derrickstolee/maintenance-and-headless
Include Windows-specific maintenance and headless-git
2021-11-09 18:43:57 -05:00
Johannes Schindelin
4e2b6c29c6 Merge 'git-gui/js/intent-to-add'
This merges the current version of the patch that tries to address Git
GUI's problems with intent-to-add files.

This patch will likely be improved substantially before it is merged
into Git GUI's main branch, but we want to have _something_ resembling a
fix already in Git for Windows v2.29.0.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:57 -05:00
Johannes Schindelin
d5f5a4bc90 Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
t/t0014: fix: eliminate additional lines from trace
2021-11-09 18:43:57 -05:00
Johannes Schindelin
c0492f55e6 Merge pull request #2714 from lbonanomi/main
Rationalize line endings for scissors-cleanup
2021-11-09 18:43:56 -05:00
Johannes Schindelin
4ee7b3d198 Merge pull request #2730 from dscho/crlf-aware-git-add-i
git add -i: handle CR/LF line endings in the interactive input
2021-11-09 18:43:56 -05:00
Johannes Schindelin
da4c75ab2c Merge 'add-p-many-files'
This topic branch allows `add -p` and `add -i` with a large number of
files. It is kind of a hack that was never really meant to be
upstreamed. Let's see if we can do better in the built-in `add -p`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:56 -05:00
Johannes Schindelin
83bce66076 Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
ci: avoid d/f conflict in vs/master
2021-11-09 18:43:56 -05:00
Johannes Schindelin
b830e6f5ab Merge pull request #2535 from dscho/schannel-revoke-best-effort
Introduce and use the new "best effort" strategy for Secure Channel revoke checking
2021-11-09 18:43:56 -05:00
Johannes Schindelin
c9b4901185 Merge pull request #2506 from dscho/issue-2283
Allow running Git directly from `C:\Program Files\Git\mingw64\bin\git.exe`
2021-11-09 18:43:56 -05:00
Johannes Schindelin
189b9b9346 Merge pull request #2504 from dscho/access-repo-via-junction
Handle `git add <file>` where <file> traverses an NTFS junction
2021-11-09 18:43:56 -05:00
Johannes Schindelin
2418cef743 Merge pull request #2501 from jeffhostetler/clink-debug-curl
clink.pl: fix MSVC compile script to handle libcurl-d.lib
2021-11-09 18:43:56 -05:00
Johannes Schindelin
70d1682ec2 Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2021-11-09 18:43:56 -05:00
Johannes Schindelin
af74bb2dc1 Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
Do resolve symlinks in `getcwd()`
2021-11-09 18:43:55 -05:00
Johannes Schindelin
b2c331ec64 Merge pull request #2405 from dscho/mingw-setsockopt
Make sure `errno` is set when socket operations fail
2021-11-09 18:43:55 -05:00
Johannes Schindelin
3770466819 Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
2021-11-09 18:43:55 -05:00
Johannes Schindelin
970b265420 Merge branch 'msys2-python'
In MSYS2, we have two Python interpreters at our disposal, so we can
include the Python stuff in the build.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:55 -05:00
Johannes Schindelin
663e68e729 Merge branch 'dont-clean-junctions'
This topic branch teaches `git clean` to respect NTFS junctions and Unix
bind mounts: it will now stop at those boundaries.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:55 -05:00
Johannes Schindelin
80ecb046ad Merge pull request #2170 from dscho/gitk-long-cmdline
Fix gitk (long cmdline)
2021-11-09 18:43:55 -05:00
Johannes Schindelin
894f87df9c Merge branch 'fsync-object-files-always'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:55 -05:00
Johannes Schindelin
2e19e00a88 Merge branch 'dont-spawn-gzip-in-archive'
This topic branch avoids spawning `gzip` when asking `git archive` to
create `.tar.gz` files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:55 -05:00
Johannes Schindelin
f334847b39 Merge branch 'drive-prefix'
This topic branch allows us to specify absolute paths without the drive
prefix e.g. when cloning.

Example:

	C:\Users\me> git clone https://github.com/git/git \upstream-git

This will clone into a new directory C:\upstream-git, in line with how
Windows interprets absolute paths.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2021-11-09 18:43:55 -05:00