summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-15 10:39:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-15 10:39:47 (GMT)
commit789a09b4874ae2616987794e0e739b8227957175 (patch)
tree5ff86b36326dff2c1f26e630fca4da7e10581b73 /read-cache.c
parent3cd4f5e8eb04ae01298ceaf46bb41a4277031916 (diff)
downloadgit-789a09b4874ae2616987794e0e739b8227957175.zip
git-789a09b4874ae2616987794e0e739b8227957175.tar.gz
git-789a09b4874ae2616987794e0e739b8227957175.tar.bz2
avoid nanosleep(2)
On Solaris nanosleep(2) is not available in libc; you need to link with -lrt to get it. The purpose of the loop is to wait until the next filesystem timestamp granularity, and the code uses subsecond sleep in the hope that it can shorten the delay to 0.5 seconds on average instead of a full second. It is probably not worth depending on an extra library for this. We might want to yank out the whole "racy-git avoidance is costly later at runtime, so let's delay writing the index out" codepath later, but that is a separate issue and needs some testing on large trees to figure it out. After playing with the kernel tree, I have a feeling that the whole thing may not be worth it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/read-cache.c b/read-cache.c
index b18f9f7..ec4dd5a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -5,7 +5,6 @@
*/
#include "cache.h"
#include "cache-tree.h"
-#include <time.h>
/* Index extensions.
*
@@ -1033,11 +1032,8 @@ int write_cache(int newfd, struct cache_entry **cache, int entries)
fprintf(stderr, "now %lu\n", now);
#endif
while (!fstat(newfd, &st) && st.st_mtime <= now) {
- struct timespec rq, rm;
off_t where = lseek(newfd, 0, SEEK_CUR);
- rq.tv_sec = 0;
- rq.tv_nsec = 250000000;
- nanosleep(&rq, &rm);
+ sleep(1);
if ((where == (off_t) -1) ||
(write(newfd, "", 1) != 1) ||
(lseek(newfd, -1, SEEK_CUR) != where) ||