aboutsummaryrefslogtreecommitdiff
path: root/runit/runsv.c
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-31 21:45:52 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-31 21:45:52 +0000
commit7bc5360bba5ae057771200e2d5ae55c45f178c0d (patch)
tree0929ad64b228119c8f0bc7bda08fe5bb4c7f5907 /runit/runsv.c
parent05241802a7c7c4f85b69f34c5c13df88cdf9fb1e (diff)
downloadbusybox-7bc5360bba5ae057771200e2d5ae55c45f178c0d.tar.gz
busybox-7bc5360bba5ae057771200e2d5ae55c45f178c0d.tar.bz2
isrv: use monotonic_sec
runsv: do not use clock_gettime if !MONOTONIC_CLOCK
Diffstat (limited to 'runit/runsv.c')
-rw-r--r--runit/runsv.c36
1 files changed, 28 insertions, 8 deletions
diff --git a/runit/runsv.c b/runit/runsv.c
index baef6e13f..b35c26630 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -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;