picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

timer: consider (usec_t) -1 an invalid timestamp

This commit is contained in:
Lennart Poettering 2013-11-11 03:03:17 +01:00
parent 1fcf71f562
commit 966204e010
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -43,6 +43,8 @@ CGroup Rework Completion:
Features:
* be more careful what we export on the bus as (usec_t) 0 and (usec_t) -1
* check :no-sender logic after PID 1 conversion
* increase journal files by a few MB each time, instead of piecemeal

4
src/shared/time-util.c
View File

@ -158,7 +158,7 @@ char *format_timestamp(char *buf, size_t l, usec_t t) {
assert(buf);
assert(l > 0);
if (t <= 0)
if (t <= 0 || t == (usec_t) -1)
return NULL;
sec = (time_t) (t / USEC_PER_SEC);
@ -176,7 +176,7 @@ char *format_timestamp_us(char *buf, size_t l, usec_t t) {
assert(buf);
assert(l > 0);
if (t <= 0)
if (t <= 0 || t == (usec_t) -1)
return NULL;
sec = (time_t) (t / USEC_PER_SEC);

5
src/shared/time-util.h
View File

@ -64,7 +64,10 @@ dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
dual_timestamp* dual_timestamp_from_monotonic(dual_timestamp *ts, usec_t u);
#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
static inline bool dual_timestamp_is_set(dual_timestamp *ts) {
return ((ts->realtime > 0 && ts->realtime != (usec_t) -1) ||
(ts->monotonic > 0 && ts->monotonic != (usec_t) -1));
}
usec_t timespec_load(const struct timespec *ts) _pure_;
struct timespec *timespec_store(struct timespec *ts, usec_t u);