daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
65878a
From eaae0683686ccd07d1cf79f2247032586162f854 Mon Sep 17 00:00:00 2001
65878a
From: Lennart Poettering <lennart@poettering.net>
65878a
Date: Mon, 11 Nov 2013 03:03:17 +0100
65878a
Subject: [PATCH] timer: consider (usec_t) -1 an invalid timestamp
65878a
65878a
---
65878a
 src/shared/time-util.c | 4 ++--
65878a
 src/shared/time-util.h | 5 ++++-
65878a
 2 files changed, 6 insertions(+), 3 deletions(-)
65878a
65878a
diff --git a/src/shared/time-util.c b/src/shared/time-util.c
65878a
index b8a6bd7..81d4ede 100644
65878a
--- a/src/shared/time-util.c
65878a
+++ b/src/shared/time-util.c
65878a
@@ -157,7 +157,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
65878a
         assert(buf);
65878a
         assert(l > 0);
65878a
 
65878a
-        if (t <= 0)
65878a
+        if (t <= 0 || t == (usec_t) -1)
65878a
                 return NULL;
65878a
 
65878a
         sec = (time_t) (t / USEC_PER_SEC);
65878a
@@ -175,7 +175,7 @@ char *format_timestamp_us(char *buf, size_t l, usec_t t) {
65878a
         assert(buf);
65878a
         assert(l > 0);
65878a
 
65878a
-        if (t <= 0)
65878a
+        if (t <= 0 || t == (usec_t) -1)
65878a
                 return NULL;
65878a
 
65878a
         sec = (time_t) (t / USEC_PER_SEC);
65878a
diff --git a/src/shared/time-util.h b/src/shared/time-util.h
65878a
index 7660fe1..bc10d22 100644
65878a
--- a/src/shared/time-util.h
65878a
+++ b/src/shared/time-util.h
65878a
@@ -64,7 +64,10 @@ dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
65878a
 dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
65878a
 dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
65878a
 
65878a
-#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
65878a
+static inline bool dual_timestamp_is_set(dual_timestamp *ts) {
65878a
+        return ((ts->realtime > 0 && ts->realtime != (usec_t) -1) ||
65878a
+                (ts->monotonic > 0 && ts->monotonic != (usec_t) -1));
65878a
+}
65878a
 
65878a
 usec_t timespec_load(const struct timespec *ts) _pure_;
65878a
 struct timespec *timespec_store(struct timespec *ts, usec_t u);