chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qcow2: when dissecting qcow2, use btrfs clone ioctls for reflinking blocks to target
[elogind.git]
/
src
/
shared
/
time-util.c
diff --git
a/src/shared/time-util.c
b/src/shared/time-util.c
index 09f4a21354c5eedba4df460cb66f5ec5bb54b6ea..d3404afd55f140aeb16316890ef53b758e8d2291 100644
(file)
--- a/
src/shared/time-util.c
+++ b/
src/shared/time-util.c
@@
-49,25
+49,20
@@
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
int64_t delta;
assert(ts);
int64_t delta;
assert(ts);
- if (u == USEC_INFINITY) {
- ts->realtime = ts->monotonic =
USEC_INFINITY
;
+ if (u == USEC_INFINITY
|| u <= 0
) {
+ ts->realtime = ts->monotonic =
u
;
return ts;
}
ts->realtime = u;
return ts;
}
ts->realtime = u;
- if (u == 0)
- ts->monotonic = 0;
- else {
- delta = (int64_t) now(CLOCK_REALTIME) - (int64_t) u;
-
- ts->monotonic = now(CLOCK_MONOTONIC);
+ delta = (int64_t) now(CLOCK_REALTIME) - (int64_t) u;
+ ts->monotonic = now(CLOCK_MONOTONIC);
- if ((int64_t) ts->monotonic > delta)
- ts->monotonic -= delta;
- else
- ts->monotonic = 0;
- }
+ if ((int64_t) ts->monotonic > delta)
+ ts->monotonic -= delta;
+ else
+ ts->monotonic = 0;
return ts;
}
return ts;
}
@@
-152,7
+147,7
@@
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
return tv;
}
return tv;
}
-char *format_timestamp_internal(char *buf, size_t l, usec_t t, bool utc) {
+
static
char *format_timestamp_internal(char *buf, size_t l, usec_t t, bool utc) {
struct tm tm;
time_t sec;
struct tm tm;
time_t sec;
@@
-178,7
+173,11
@@
char *format_timestamp(char *buf, size_t l, usec_t t) {
return format_timestamp_internal(buf, l, t, false);
}
return format_timestamp_internal(buf, l, t, false);
}
-char *format_timestamp_us(char *buf, size_t l, usec_t t, bool utc) {
+char *format_timestamp_utc(char *buf, size_t l, usec_t t) {
+ return format_timestamp_internal(buf, l, t, true);
+}
+
+static char *format_timestamp_internal_us(char *buf, size_t l, usec_t t, bool utc) {
struct tm tm;
time_t sec;
struct tm tm;
time_t sec;
@@
-203,15
+202,22
@@
char *format_timestamp_us(char *buf, size_t l, usec_t t, bool utc) {
return buf;
}
return buf;
}
+char *format_timestamp_us(char *buf, size_t l, usec_t t) {
+ return format_timestamp_internal_us(buf, l, t, false);
+}
+
+char *format_timestamp_us_utc(char *buf, size_t l, usec_t t) {
+ return format_timestamp_internal_us(buf, l, t, true);
+}
+
char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
const char *s;
usec_t n, d;
char *format_timestamp_relative(char *buf, size_t l, usec_t t) {
const char *s;
usec_t n, d;
- n = now(CLOCK_REALTIME);
-
- if (t <= 0 || (t == USEC_INFINITY))
+ if (t <= 0 || t == USEC_INFINITY)
return NULL;
return NULL;
+ n = now(CLOCK_REALTIME);
if (n > t) {
d = n - t;
s = "ago";
if (n > t) {
d = n - t;
s = "ago";
@@
-290,8
+296,14
@@
char *format_timespan(char *buf, size_t l, usec_t t, usec_t accuracy) {
assert(buf);
assert(l > 0);
assert(buf);
assert(l > 0);
- if (t == USEC_INFINITY || t <= 0) {
- strncpy(p, t == USEC_INFINITY ? "infinity" : "0", l);
+ if (t == USEC_INFINITY) {
+ strncpy(p, "infinity", l-1);
+ p[l-1] = 0;
+ return p;
+ }
+
+ if (t <= 0) {
+ strncpy(p, "0", l-1);
p[l-1] = 0;
return p;
}
p[l-1] = 0;
return p;
}
@@
-761,7
+773,7
@@
int parse_nsec(const char *t, nsec_t *nsec) {
{ "", 1ULL }, /* default is nsec */
};
{ "", 1ULL }, /* default is nsec */
};
- const char *p;
+ const char *p
, *s
;
nsec_t r = 0;
bool something = false;
nsec_t r = 0;
bool something = false;
@@
-769,6
+781,18
@@
int parse_nsec(const char *t, nsec_t *nsec) {
assert(nsec);
p = t;
assert(nsec);
p = t;
+
+ p += strspn(p, WHITESPACE);
+ s = startswith(p, "infinity");
+ if (s) {
+ s += strspn(s, WHITESPACE);
+ if (!*s != 0)
+ return -EINVAL;
+
+ *nsec = NSEC_INFINITY;
+ return 0;
+ }
+
for (;;) {
long long l, z = 0;
char *e;
for (;;) {
long long l, z = 0;
char *e;