From: Heiko Voigt <hvoigt@hvoigt.net>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Pat Thoyts <patthoyts@users.sourceforge.net>,
msysgit@googlegroups.com, git@vger.kernel.org,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 2/8] mingw: work around irregular failures of unlink on windows
Date: Tue, 14 Dec 2010 23:11:34 +0100 [thread overview]
Message-ID: <20101214221134.GC4084@sandbox> (raw)
In-Reply-To: <20101214220604.GA4084@sandbox>
If a file is opened by another process (e.g. indexing of an IDE) for
reading it is not allowed to be deleted. So in case unlink fails retry
after waiting for some time. This extends the workaround from 6ac6f878.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
compat/mingw.c | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index a7e1c6b..52183a7 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -3,6 +3,8 @@
#include <conio.h>
#include "../strbuf.h"
+static const int delay[] = { 0, 1, 10, 20, 40 };
+
int err_win_to_posix(DWORD winerr)
{
int error = ENOSYS;
@@ -116,12 +118,38 @@ int err_win_to_posix(DWORD winerr)
return error;
}
+static inline int is_file_in_use_error(DWORD errcode)
+{
+ switch(GetLastError()) {
+ case ERROR_SHARING_VIOLATION:
+ case ERROR_ACCESS_DENIED:
+ return 1;
+ }
+
+ return 0;
+}
+
#undef unlink
int mingw_unlink(const char *pathname)
{
+ int ret, tries = 0;
+
/* read-only files cannot be removed */
chmod(pathname, 0666);
- return unlink(pathname);
+ while ((ret = unlink(pathname)) == -1 && tries < ARRAY_SIZE(delay)) {
+ if (!is_file_in_use_error(GetLastError()))
+ break;
+ /*
+ * We assume that some other process had the source or
+ * destination file open at the wrong moment and retry.
+ * In order to give the other process a higher chance to
+ * complete its operation, we give up our time slice now.
+ * If we have to retry again, we do sleep a bit.
+ */
+ Sleep(delay[tries]);
+ tries++;
+ }
+ return ret;
}
#undef open
@@ -1257,7 +1285,6 @@ int mingw_rename(const char *pold, const char *pnew)
{
DWORD attrs, gle;
int tries = 0;
- static const int delay[] = { 0, 1, 10, 20, 40 };
/*
* Try native rename() first to get errno right.
--
1.7.3.3.566.gf422f
next prev parent reply other threads:[~2010-12-14 22:11 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 22:06 [PATCH v3 0/5] make open/unlink failures user friendly on windows using retry/abort Heiko Voigt
2010-12-14 22:09 ` [PATCH v3 1/8] mingw: move unlink wrapper to mingw.c Heiko Voigt
2010-12-14 22:11 ` Heiko Voigt [this message]
2010-12-14 22:14 ` [PATCH v3 2/8] mingw: work around irregular failures of unlink on windows Erik Faye-Lund
2010-12-14 22:31 ` Heiko Voigt
2010-12-14 22:44 ` [PATCH v4 2/5] " Heiko Voigt
2010-12-14 22:21 ` [PATCH v3 3/8] mingw: make failures to unlink or move raise a question Heiko Voigt
2010-12-14 22:35 ` Erik Faye-Lund
2010-12-14 23:52 ` Junio C Hamano
2010-12-15 7:48 ` Heiko Voigt
2010-12-15 0:11 ` Johannes Schindelin
2010-12-15 3:05 ` Junio C Hamano
2010-12-15 7:28 ` Heiko Voigt
2010-12-15 9:09 ` Erik Faye-Lund
2010-12-15 7:36 ` Heiko Voigt
2010-12-14 22:25 ` [PATCH v3 4/5] mingw: add fallback for rmdir in case directory is in use Heiko Voigt
2010-12-14 22:28 ` [PATCH v3 5/5] mingw_rmdir: set errno=ENOTEMPTY when appropriate Heiko Voigt
2010-12-14 22:49 ` Erik Faye-Lund
2010-12-15 0:21 ` Johannes Schindelin
2010-12-15 15:52 ` [PATCH v3 0/5] make open/unlink failures user friendly on windows using retry/abort Erik Faye-Lund
2010-12-15 20:45 ` Junio C Hamano
2011-02-07 20:48 ` [PATCH v4 " Heiko Voigt
2011-02-07 20:49 ` [PATCH v4 1/5] mingw: move unlink wrapper to mingw.c Heiko Voigt
2011-02-17 23:18 ` Johannes Schindelin
2011-02-07 20:50 ` [PATCH v4 2/5] mingw: work around irregular failures of unlink on windows Heiko Voigt
2011-02-07 20:51 ` [PATCH v4 3/5] mingw: make failures to unlink or move raise a question Heiko Voigt
2011-02-07 20:52 ` [PATCH v4 4/5] mingw: add fallback for rmdir in case directory is in use Heiko Voigt
2011-02-07 20:54 ` [PATCH v4 5/5] mingw_rmdir: set errno=ENOTEMPTY when appropriate Heiko Voigt
2011-02-07 21:07 ` Erik Faye-Lund
2011-02-07 21:18 ` [msysGit] " Heiko Voigt
2011-02-07 21:23 ` Erik Faye-Lund
2011-02-07 21:54 ` Junio C Hamano
2011-02-07 21:57 ` Erik Faye-Lund
2011-02-08 4:34 ` [PATCH v4 0/5] make open/unlink failures user friendly on windows using retry/abort Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101214221134.GC4084@sandbox \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=msysgit@googlegroups.com \
--cc=patthoyts@users.sourceforge.net \
/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.
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 NNTP newsgroup(s).