isrv: use monotonic_sec

runsv: do not use clock_gettime if !MONOTONIC_CLOCK
This commit is contained in:
Denis Vlasenko
2007-08-31 21:45:52 +00:00
parent 05241802a7
commit 7bc5360bba
2 changed files with 30 additions and 24 deletions

View File

@@ -33,6 +33,34 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "libbb.h"
#include "runit_lib.h"
#if ENABLE_MONOTONIC_SYSCALL
#include <sys/syscall.h>
/* libc has incredibly messy way of doing this,
* typically requiring -lrt. We just skip all this mess */
static void gettimeofday_ns(struct timespec *ts)
{
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
}
#else
static void gettimeofday_ns(struct timespec *ts)
{
if (sizeof(struct timeval) == sizeof(struct timespec)
&& sizeof(((struct timeval*)ts)->tv_usec) == sizeof(ts->tv_nsec)
) {
/* Cheat */
gettimeofday((void*)ts, NULL);
ts->tv_nsec *= 1000;
} else {
extern void BUG_need_to_implement_gettimeofday_ns(void);
BUG_need_to_implement_gettimeofday_ns();
}
}
#endif
/* Compare possibly overflowing unsigned counters */
#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
static int selfpipe[2];
/* state */
@@ -126,14 +154,6 @@ static int rename_or_warn(const char *old, const char *new)
return 0;
}
#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
#include <sys/syscall.h>
static void gettimeofday_ns(struct timespec *ts)
{
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
}
static void update_status(struct svdir *s)
{
ssize_t sz;