diff options
| -rw-r--r-- | cfg.mk | 6 | ||||
| -rw-r--r-- | src/sort.c | 13 | ||||
| -rw-r--r-- | src/tail.c | 2 |
3 files changed, 14 insertions, 7 deletions
@@ -239,4 +239,10 @@ sc_require_stdio_safer: else :; \ fi +# Prefer xnanosleep over other less-precise sleep methods +sc_prohibit_sleep: + @re='\<(nano|u)?sleep \(' \ + msg='prefer xnanosleep over other sleep interfaces' \ + $(_prohibit_regexp) + include $(srcdir)/dist-check.mk diff --git a/src/sort.c b/src/sort.c index 0213fee1f..8709e5370 100644 --- a/src/sort.c +++ b/src/sort.c @@ -44,6 +44,7 @@ #include "strnumcmp.h" #include "xmemcoll.h" #include "xmemxfrm.h" +#include "xnanosleep.h" #include "xstrtol.h" #if HAVE_SYS_RESOURCE_H @@ -107,13 +108,13 @@ enum /* The number of times we should try to fork a compression process (we retry if the fork call fails). We don't _need_ to compress temp files, this is just to reduce disk access, so this number - can be small. */ - MAX_FORK_TRIES_COMPRESS = 2, + can be small. Each retry doubles in duration. */ + MAX_FORK_TRIES_COMPRESS = 4, /* The number of times we should try to fork a decompression process. If we can't fork a decompression process, we can't sort, so this - number should be big. */ - MAX_FORK_TRIES_DECOMPRESS = 8 + number should be big. Each retry doubles in duration. */ + MAX_FORK_TRIES_DECOMPRESS = 9 }; /* The representation of the decimal point in the current locale. */ @@ -868,7 +869,7 @@ pipe_fork (int pipefds[2], size_t tries) #if HAVE_WORKING_FORK struct tempnode *saved_temphead; int saved_errno; - unsigned int wait_retry = 1; + double wait_retry = 0.25; pid_t pid IF_LINT (= -1); struct cs_status cs; @@ -895,7 +896,7 @@ pipe_fork (int pipefds[2], size_t tries) break; else { - sleep (wait_retry); + xnanosleep (wait_retry); wait_retry *= 2; reap_some (); } diff --git a/src/tail.c b/src/tail.c index 9a2f5ae82..2bd9e3d65 100644 --- a/src/tail.c +++ b/src/tail.c @@ -1619,7 +1619,7 @@ tail_file (struct File_spec *f, uintmax_t n_units) /* Before the tail function provided `read_pos', there was a race condition described in the URL below. This sleep call made the window big enough to exercise the problem. */ - sleep (1); + xnanosleep (1); #endif f->errnum = ok - 1; if (fstat (fd, &stats) < 0) |