summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2015-06-05 21:45:07 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-05 15:00:32 -0700
commit30f8160d26f11156a6792565fe694c813406b929 (patch)
treeb2b1b2e06ff0319a807242e99883d01b1cd278c3 /lockfile.c
parenta8a17756bbc9617ba22d0c78a73fce5bb2faa6f2 (diff)
downloadgit-30f8160d26f11156a6792565fe694c813406b929.tar.gz
lockfile: wait using sleep_millisec() instead of select()js/sleep-without-select
Use the new function sleep_millisec() to delay execution for a short time. This avoids the invocation of select() with just a timeout, but no file descriptors. Such a use of select() is quit with EINVAL on Windows, leading to no delay at all. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/lockfile.c b/lockfile.c
index 3f5b699cf7..fb78bda495 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -157,14 +157,6 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
return lk->fd;
}
-static int sleep_microseconds(long us)
-{
- struct timeval tv;
- tv.tv_sec = 0;
- tv.tv_usec = us;
- return select(0, NULL, NULL, NULL, &tv);
-}
-
/*
* Constants defining the gaps between attempts to lock a file. The
* first backoff period is approximately INITIAL_BACKOFF_MS
@@ -214,7 +206,7 @@ static int lock_file_timeout(struct lock_file *lk, const char *path,
backoff_ms = multiplier * INITIAL_BACKOFF_MS;
/* back off for between 0.75*backoff_ms and 1.25*backoff_ms */
wait_ms = (750 + rand() % 500) * backoff_ms / 1000;
- sleep_microseconds(wait_ms*1000);
+ sleep_millisec(wait_ms);
remaining_ms -= wait_ms;
/* Recursion: (n+1)^2 = n^2 + 2n + 1 */