Skip to content

Commit

Permalink
Fix checkout of large files to network shares on Windows XP
Browse files Browse the repository at this point in the history
Bigger writes to network drives on Windows XP fail.  Cap them at 31MB to
allow them to succeed.  Callers need to be prepared for write() calls
that do less work than requested anyway.

On local drives, write() calls are translated to WriteFile() calls with
a cap of 64KB on Windows XP and 256KB on Vista.  Thus a cap of 31MB won't
affect the number of WriteFile() calls which do the actual work.  There's
still room for some other version of Windows to use a chunk size of 1MB
without increasing the number of system calls.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and gitster committed May 20, 2010
1 parent fc012c2 commit c8b2964
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
17 changes: 17 additions & 0 deletions compat/mingw.c
Expand Up @@ -140,6 +140,23 @@ int mingw_open (const char *filename, int oflags, ...)
return fd;
}

#undef write
ssize_t mingw_write(int fd, const void *buf, size_t count)
{
/*
* While write() calls to a file on a local disk are translated
* into WriteFile() calls with a maximum size of 64KB on Windows
* XP and 256KB on Vista, no such cap is placed on writes to
* files over the network on Windows XP. Unfortunately, there
* seems to be a limit of 32MB-28KB on X64 and 64MB-32KB on x86;
* bigger writes fail on Windows XP.
* So we cap to a nice 31MB here to avoid write failures over
* the net without changing the number of WriteFile() calls in
* the local case.
*/
return write(fd, buf, min(count, 31 * 1024 * 1024));
}

#undef fopen
FILE *mingw_fopen (const char *filename, const char *otype)
{
Expand Down
3 changes: 3 additions & 0 deletions compat/mingw.h
Expand Up @@ -170,6 +170,9 @@ int link(const char *oldpath, const char *newpath);
int mingw_open (const char *filename, int oflags, ...);
#define open mingw_open

ssize_t mingw_write(int fd, const void *buf, size_t count);
#define write mingw_write

FILE *mingw_fopen (const char *filename, const char *otype);
#define fopen mingw_fopen

Expand Down
12 changes: 9 additions & 3 deletions t/t5705-clone-2gb.sh
Expand Up @@ -12,7 +12,7 @@ test_expect_success 'setup' '
git config pack.compression 0 &&
git config pack.depth 0 &&
blobsize=$((20*1024*1024)) &&
blobsize=$((100*1024*1024)) &&
blobcount=$((2*1024*1024*1024/$blobsize+1)) &&
i=1 &&
(while test $i -le $blobcount
Expand All @@ -36,9 +36,15 @@ test_expect_success 'setup' '
'

test_expect_success 'clone' '
test_expect_success 'clone - bare' '
git clone --bare --no-hardlinks . clone
git clone --bare --no-hardlinks . clone-bare
'

test_expect_success 'clone - with worktree, file:// protocol' '
git clone file://. clone-wt
'

Expand Down

0 comments on commit c8b2964

Please sign in to comment.