git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Sven Strickroth <email@cs-ware.de>
Subject: [PATCH 1/3] win32mmap: set errno appropriately
Date: Fri, 22 Apr 2016 16:31:22 +0200 (CEST)	[thread overview]
Message-ID: <ff12776a7f76c0e924222a0a04b0ae6f571b571c.1461335463.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1461335463.git.johannes.schindelin@gmx.de>

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>
---
 compat/win32mmap.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/compat/win32mmap.c b/compat/win32mmap.c
index 80a8c9a..3a39f0f 100644
--- a/compat/win32mmap.c
+++ b/compat/win32mmap.c
@@ -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,
 		PAGE_WRITECOPY, 0, 0, NULL);
 
-	if (!hmap)
+	if (!hmap) {
+		errno = EINVAL;
 		return MAP_FAILED;
+	}
 
 	temp = MapViewOfFileEx(hmap, FILE_MAP_COPY, h, l, length, start);
 
 	if (!CloseHandle(hmap))
 		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)
-- 
2.8.1.306.gff998f2

  reply	other threads:[~2016-04-22 14:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-22 14:31 [PATCH 0/3] Improve the mmap() emulation on Windows Johannes Schindelin
2016-04-22 14:31 ` Johannes Schindelin [this message]
2016-04-22 14:31 ` [PATCH 2/3] mmap(win32): avoid copy-on-write when it is unnecessary Johannes Schindelin
2016-04-26 18:53   ` Johannes Sixt
2016-04-27  6:43     ` Johannes Schindelin
2016-04-27 18:51       ` Johannes Sixt
2016-04-28  8:03         ` Johannes Schindelin
2016-04-22 14:31 ` [PATCH 3/3] mmap(win32): avoid expensive fstat() call Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ff12776a7f76c0e924222a0a04b0ae6f571b571c.1461335463.git.johannes.schindelin@gmx.de \
    --to=johannes.schindelin@gmx.de \
    --cc=email@cs-ware.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).