зеркало из https://github.com/microsoft/git.git
win32mmap: set errno appropriately
It is not really helpful when a `git fetch` fails with the message: fatal: mmap failed: No error In the particular instance encountered by a colleague of yours truly, the Win32 error code was ERROR_COMMITMENT_LIMIT which means that the page file is not big enough. Let's make the message fatal: mmap failed: File too large instead, which is only marginally better, but which can be associated with the appropriate work-around: setting `core.packedGitWindowSize` to a relatively small value. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
6a6636270f
Коммит
6a730e10a7
|
@ -24,15 +24,21 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
|
||||||
hmap = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL,
|
hmap = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL,
|
||||||
PAGE_WRITECOPY, 0, 0, NULL);
|
PAGE_WRITECOPY, 0, 0, NULL);
|
||||||
|
|
||||||
if (!hmap)
|
if (!hmap) {
|
||||||
|
errno = EINVAL;
|
||||||
return MAP_FAILED;
|
return MAP_FAILED;
|
||||||
|
}
|
||||||
|
|
||||||
temp = MapViewOfFileEx(hmap, FILE_MAP_COPY, h, l, length, start);
|
temp = MapViewOfFileEx(hmap, FILE_MAP_COPY, h, l, length, start);
|
||||||
|
|
||||||
if (!CloseHandle(hmap))
|
if (!CloseHandle(hmap))
|
||||||
warning("unable to close file mapping handle");
|
warning("unable to close file mapping handle");
|
||||||
|
|
||||||
return temp ? temp : MAP_FAILED;
|
if (temp)
|
||||||
|
return temp;
|
||||||
|
|
||||||
|
errno = GetLastError() == ERROR_COMMITMENT_LIMIT ? EFBIG : EINVAL;
|
||||||
|
return MAP_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
int git_munmap(void *start, size_t length)
|
int git_munmap(void *start, size_t length)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче