util: split off time related calls from util.[ch] into time-util.[ch]
This commit is contained in:
Lennart Poettering
parent
aaa870928f
commit
9a98c7a156
|
|
@ -787,6 +787,8 @@ libsystemd_shared_la_SOURCES = \
|
|||
src/shared/virt.h \
|
||||
src/shared/path-util.c \
|
||||
src/shared/path-util.h \
|
||||
src/shared/time-util.c \
|
||||
src/shared/time-util.h \
|
||||
src/shared/hashmap.c \
|
||||
src/shared/hashmap.h \
|
||||
src/shared/set.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,575 @@
|
|||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "time-util.h"
|
||||
|
||||
usec_t now(clockid_t clock_id) {
|
||||
struct timespec ts;
|
||||
|
||||
assert_se(clock_gettime(clock_id, &ts) == 0);
|
||||
|
||||
return timespec_load(&ts);
|
||||
}
|
||||
|
||||
dual_timestamp* dual_timestamp_get(dual_timestamp *ts) {
|
||||
assert(ts);
|
||||
|
||||
ts->realtime = now(CLOCK_REALTIME);
|
||||
ts->monotonic = now(CLOCK_MONOTONIC);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
|
||||
int64_t delta;
|
||||
assert(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);
|
||||
|
||||
if ((int64_t) ts->monotonic > delta)
|
||||
ts->monotonic -= delta;
|
||||
else
|
||||
ts->monotonic = 0;
|
||||
}
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
usec_t timespec_load(const struct timespec *ts) {
|
||||
assert(ts);
|
||||
|
||||
if (ts->tv_sec == (time_t) -1 &&
|
||||
ts->tv_nsec == (long) -1)
|
||||
return (usec_t) -1;
|
||||
|
||||
if ((usec_t) ts->tv_sec > (UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / USEC_PER_SEC)
|
||||
return (usec_t) -1;
|
||||
|
||||
return
|
||||
(usec_t) ts->tv_sec * USEC_PER_SEC +
|
||||
(usec_t) ts->tv_nsec / NSEC_PER_USEC;
|
||||
}
|
||||
|
||||
struct timespec *timespec_store(struct timespec *ts, usec_t u) {
|
||||
assert(ts);
|
||||
|
||||
if (u == (usec_t) -1) {
|
||||
ts->tv_sec = (time_t) -1;
|
||||
ts->tv_nsec = (long) -1;
|
||||
return ts;
|
||||
}
|
||||
|
||||
ts->tv_sec = (time_t) (u / USEC_PER_SEC);
|
||||
ts->tv_nsec = (long int) ((u % USEC_PER_SEC) * NSEC_PER_USEC);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
usec_t timeval_load(const struct timeval *tv) {
|
||||
assert(tv);
|
||||
|
||||
if (tv->tv_sec == (time_t) -1 &&
|
||||
tv->tv_usec == (suseconds_t) -1)
|
||||
return (usec_t) -1;
|
||||
|
||||
if ((usec_t) tv->tv_sec > (UINT64_MAX - tv->tv_usec) / USEC_PER_SEC)
|
||||
return (usec_t) -1;
|
||||
|
||||
return
|
||||
(usec_t) tv->tv_sec * USEC_PER_SEC +
|
||||
(usec_t) tv->tv_usec;
|
||||
}
|
||||
|
||||
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
|
||||
assert(tv);
|
||||
|
||||
if (u == (usec_t) -1) {
|
||||
tv->tv_sec = (time_t) -1;
|
||||
tv->tv_usec = (suseconds_t) -1;
|
||||
return tv;
|
||||
}
|
||||
|
||||
tv->tv_sec = (time_t) (u / USEC_PER_SEC);
|
||||
tv->tv_usec = (suseconds_t) (u % USEC_PER_SEC);
|
||||
|
||||
return tv;
|
||||
}
|
||||
|
||||
char *format_timestamp(char *buf, size_t l, usec_t t) {
|
||||
struct tm tm;
|
||||
time_t sec;
|
||||
|
||||
assert(buf);
|
||||
assert(l > 0);
|
||||
|
||||
if (t <= 0)
|
||||
return NULL;
|
||||
|
||||
sec = (time_t) (t / USEC_PER_SEC);
|
||||
|
||||
if (strftime(buf, l, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&sec, &tm)) <= 0)
|
||||
return NULL;
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
char *format_timestamp_pretty(char *buf, size_t l, usec_t t) {
|
||||
usec_t n, d;
|
||||
|
||||
n = now(CLOCK_REALTIME);
|
||||
|
||||
if (t <= 0 || t > n || t + USEC_PER_DAY*7 <= t)
|
||||
return NULL;
|
||||
|
||||
d = n - t;
|
||||
|
||||
if (d >= USEC_PER_YEAR)
|
||||
snprintf(buf, l, "%llu years %llu months ago",
|
||||
(unsigned long long) (d / USEC_PER_YEAR),
|
||||
(unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH));
|
||||
else if (d >= USEC_PER_MONTH)
|
||||
snprintf(buf, l, "%llu months %llu days ago",
|
||||
(unsigned long long) (d / USEC_PER_MONTH),
|
||||
(unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY));
|
||||
else if (d >= USEC_PER_WEEK)
|
||||
snprintf(buf, l, "%llu weeks %llu days ago",
|
||||
(unsigned long long) (d / USEC_PER_WEEK),
|
||||
(unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY));
|
||||
else if (d >= 2*USEC_PER_DAY)
|
||||
snprintf(buf, l, "%llu days ago", (unsigned long long) (d / USEC_PER_DAY));
|
||||
else if (d >= 25*USEC_PER_HOUR)
|
||||
snprintf(buf, l, "1 day %lluh ago",
|
||||
(unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR));
|
||||
else if (d >= 6*USEC_PER_HOUR)
|
||||
snprintf(buf, l, "%lluh ago",
|
||||
(unsigned long long) (d / USEC_PER_HOUR));
|
||||
else if (d >= USEC_PER_HOUR)
|
||||
snprintf(buf, l, "%lluh %llumin ago",
|
||||
(unsigned long long) (d / USEC_PER_HOUR),
|
||||
(unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE));
|
||||
else if (d >= 5*USEC_PER_MINUTE)
|
||||
snprintf(buf, l, "%llumin ago",
|
||||
(unsigned long long) (d / USEC_PER_MINUTE));
|
||||
else if (d >= USEC_PER_MINUTE)
|
||||
snprintf(buf, l, "%llumin %llus ago",
|
||||
(unsigned long long) (d / USEC_PER_MINUTE),
|
||||
(unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC));
|
||||
else if (d >= USEC_PER_SEC)
|
||||
snprintf(buf, l, "%llus ago",
|
||||
(unsigned long long) (d / USEC_PER_SEC));
|
||||
else if (d >= USEC_PER_MSEC)
|
||||
snprintf(buf, l, "%llums ago",
|
||||
(unsigned long long) (d / USEC_PER_MSEC));
|
||||
else if (d > 0)
|
||||
snprintf(buf, l, "%lluus ago",
|
||||
(unsigned long long) d);
|
||||
else
|
||||
snprintf(buf, l, "now");
|
||||
|
||||
buf[l-1] = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
char *format_timespan(char *buf, size_t l, usec_t t) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
usec_t usec;
|
||||
} table[] = {
|
||||
{ "w", USEC_PER_WEEK },
|
||||
{ "d", USEC_PER_DAY },
|
||||
{ "h", USEC_PER_HOUR },
|
||||
{ "min", USEC_PER_MINUTE },
|
||||
{ "s", USEC_PER_SEC },
|
||||
{ "ms", USEC_PER_MSEC },
|
||||
{ "us", 1 },
|
||||
};
|
||||
|
||||
unsigned i;
|
||||
char *p = buf;
|
||||
|
||||
assert(buf);
|
||||
assert(l > 0);
|
||||
|
||||
if (t == (usec_t) -1)
|
||||
return NULL;
|
||||
|
||||
if (t == 0) {
|
||||
snprintf(p, l, "0");
|
||||
p[l-1] = 0;
|
||||
return p;
|
||||
}
|
||||
|
||||
/* The result of this function can be parsed with parse_usec */
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++) {
|
||||
int k;
|
||||
size_t n;
|
||||
|
||||
if (t < table[i].usec)
|
||||
continue;
|
||||
|
||||
if (l <= 1)
|
||||
break;
|
||||
|
||||
k = snprintf(p, l, "%s%llu%s", p > buf ? " " : "", (unsigned long long) (t / table[i].usec), table[i].suffix);
|
||||
n = MIN((size_t) k, l);
|
||||
|
||||
l -= n;
|
||||
p += n;
|
||||
|
||||
t %= table[i].usec;
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t) {
|
||||
|
||||
assert(f);
|
||||
assert(name);
|
||||
assert(t);
|
||||
|
||||
if (!dual_timestamp_is_set(t))
|
||||
return;
|
||||
|
||||
fprintf(f, "%s=%llu %llu\n",
|
||||
name,
|
||||
(unsigned long long) t->realtime,
|
||||
(unsigned long long) t->monotonic);
|
||||
}
|
||||
|
||||
void dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
|
||||
unsigned long long a, b;
|
||||
|
||||
assert(value);
|
||||
assert(t);
|
||||
|
||||
if (sscanf(value, "%lli %llu", &a, &b) != 2)
|
||||
log_debug("Failed to parse finish timestamp value %s", value);
|
||||
else {
|
||||
t->realtime = a;
|
||||
t->monotonic = b;
|
||||
}
|
||||
}
|
||||
|
||||
int parse_timestamp(const char *t, usec_t *usec) {
|
||||
const char *k;
|
||||
struct tm tm, copy;
|
||||
time_t x;
|
||||
usec_t plus = 0, minus = 0, ret;
|
||||
int r;
|
||||
|
||||
/*
|
||||
* Allowed syntaxes:
|
||||
*
|
||||
* 2012-09-22 16:34:22
|
||||
* 2012-09-22 16:34 (seconds will be set to 0)
|
||||
* 2012-09-22 (time will be set to 00:00:00)
|
||||
* 16:34:22 (date will be set to today)
|
||||
* 16:34 (date will be set to today, seconds to 0)
|
||||
* now
|
||||
* yesterday (time is set to 00:00:00)
|
||||
* today (time is set to 00:00:00)
|
||||
* tomorrow (time is set to 00:00:00)
|
||||
* +5min
|
||||
* -5days
|
||||
*
|
||||
*/
|
||||
|
||||
assert(t);
|
||||
assert(usec);
|
||||
|
||||
x = time(NULL);
|
||||
assert_se(localtime_r(&x, &tm));
|
||||
|
||||
if (streq(t, "now"))
|
||||
goto finish;
|
||||
|
||||
else if (streq(t, "today")) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (streq(t, "yesterday")) {
|
||||
tm.tm_mday --;
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (streq(t, "tomorrow")) {
|
||||
tm.tm_mday ++;
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (t[0] == '+') {
|
||||
|
||||
r = parse_usec(t+1, &plus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
goto finish;
|
||||
} else if (t[0] == '-') {
|
||||
|
||||
r = parse_usec(t+1, &minus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
goto finish;
|
||||
}
|
||||
|
||||
copy = tm;
|
||||
k = strptime(t, "%y-%m-%d %H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d %H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%y-%m-%d %H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d %H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%y-%m-%d", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
|
||||
finish:
|
||||
x = mktime(&tm);
|
||||
if (x == (time_t) -1)
|
||||
return -EINVAL;
|
||||
|
||||
ret = (usec_t) x * USEC_PER_SEC;
|
||||
|
||||
ret += plus;
|
||||
if (ret > minus)
|
||||
ret -= minus;
|
||||
else
|
||||
ret = 0;
|
||||
|
||||
*usec = ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_usec(const char *t, usec_t *usec) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
usec_t usec;
|
||||
} table[] = {
|
||||
{ "seconds", USEC_PER_SEC },
|
||||
{ "second", USEC_PER_SEC },
|
||||
{ "sec", USEC_PER_SEC },
|
||||
{ "s", USEC_PER_SEC },
|
||||
{ "minutes", USEC_PER_MINUTE },
|
||||
{ "minute", USEC_PER_MINUTE },
|
||||
{ "min", USEC_PER_MINUTE },
|
||||
{ "months", USEC_PER_MONTH },
|
||||
{ "month", USEC_PER_MONTH },
|
||||
{ "msec", USEC_PER_MSEC },
|
||||
{ "ms", USEC_PER_MSEC },
|
||||
{ "m", USEC_PER_MINUTE },
|
||||
{ "hours", USEC_PER_HOUR },
|
||||
{ "hour", USEC_PER_HOUR },
|
||||
{ "hr", USEC_PER_HOUR },
|
||||
{ "h", USEC_PER_HOUR },
|
||||
{ "days", USEC_PER_DAY },
|
||||
{ "day", USEC_PER_DAY },
|
||||
{ "d", USEC_PER_DAY },
|
||||
{ "weeks", USEC_PER_WEEK },
|
||||
{ "week", USEC_PER_WEEK },
|
||||
{ "w", USEC_PER_WEEK },
|
||||
{ "years", USEC_PER_YEAR },
|
||||
{ "year", USEC_PER_YEAR },
|
||||
{ "y", USEC_PER_YEAR },
|
||||
{ "usec", 1ULL },
|
||||
{ "us", 1ULL },
|
||||
{ "", USEC_PER_SEC }, /* default is sec */
|
||||
};
|
||||
|
||||
const char *p;
|
||||
usec_t r = 0;
|
||||
|
||||
assert(t);
|
||||
assert(usec);
|
||||
|
||||
p = t;
|
||||
do {
|
||||
long long l;
|
||||
char *e;
|
||||
unsigned i;
|
||||
|
||||
errno = 0;
|
||||
l = strtoll(p, &e, 10);
|
||||
|
||||
if (errno != 0)
|
||||
return -errno;
|
||||
|
||||
if (l < 0)
|
||||
return -ERANGE;
|
||||
|
||||
if (e == p)
|
||||
return -EINVAL;
|
||||
|
||||
e += strspn(e, WHITESPACE);
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++)
|
||||
if (startswith(e, table[i].suffix)) {
|
||||
r += (usec_t) l * table[i].usec;
|
||||
p = e + strlen(table[i].suffix);
|
||||
break;
|
||||
}
|
||||
|
||||
if (i >= ELEMENTSOF(table))
|
||||
return -EINVAL;
|
||||
|
||||
} while (*p != 0);
|
||||
|
||||
*usec = r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_nsec(const char *t, nsec_t *nsec) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
nsec_t nsec;
|
||||
} table[] = {
|
||||
{ "seconds", NSEC_PER_SEC },
|
||||
{ "second", NSEC_PER_SEC },
|
||||
{ "sec", NSEC_PER_SEC },
|
||||
{ "s", NSEC_PER_SEC },
|
||||
{ "minutes", NSEC_PER_MINUTE },
|
||||
{ "minute", NSEC_PER_MINUTE },
|
||||
{ "min", NSEC_PER_MINUTE },
|
||||
{ "months", NSEC_PER_MONTH },
|
||||
{ "month", NSEC_PER_MONTH },
|
||||
{ "msec", NSEC_PER_MSEC },
|
||||
{ "ms", NSEC_PER_MSEC },
|
||||
{ "m", NSEC_PER_MINUTE },
|
||||
{ "hours", NSEC_PER_HOUR },
|
||||
{ "hour", NSEC_PER_HOUR },
|
||||
{ "hr", NSEC_PER_HOUR },
|
||||
{ "h", NSEC_PER_HOUR },
|
||||
{ "days", NSEC_PER_DAY },
|
||||
{ "day", NSEC_PER_DAY },
|
||||
{ "d", NSEC_PER_DAY },
|
||||
{ "weeks", NSEC_PER_WEEK },
|
||||
{ "week", NSEC_PER_WEEK },
|
||||
{ "w", NSEC_PER_WEEK },
|
||||
{ "years", NSEC_PER_YEAR },
|
||||
{ "year", NSEC_PER_YEAR },
|
||||
{ "y", NSEC_PER_YEAR },
|
||||
{ "usec", NSEC_PER_USEC },
|
||||
{ "us", NSEC_PER_USEC },
|
||||
{ "nsec", 1ULL },
|
||||
{ "ns", 1ULL },
|
||||
{ "", 1ULL }, /* default is nsec */
|
||||
};
|
||||
|
||||
const char *p;
|
||||
nsec_t r = 0;
|
||||
|
||||
assert(t);
|
||||
assert(nsec);
|
||||
|
||||
p = t;
|
||||
do {
|
||||
long long l;
|
||||
char *e;
|
||||
unsigned i;
|
||||
|
||||
errno = 0;
|
||||
l = strtoll(p, &e, 10);
|
||||
|
||||
if (errno != 0)
|
||||
return -errno;
|
||||
|
||||
if (l < 0)
|
||||
return -ERANGE;
|
||||
|
||||
if (e == p)
|
||||
return -EINVAL;
|
||||
|
||||
e += strspn(e, WHITESPACE);
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++)
|
||||
if (startswith(e, table[i].suffix)) {
|
||||
r += (nsec_t) l * table[i].nsec;
|
||||
p = e + strlen(table[i].suffix);
|
||||
break;
|
||||
}
|
||||
|
||||
if (i >= ELEMENTSOF(table))
|
||||
return -EINVAL;
|
||||
|
||||
} while (*p != 0);
|
||||
|
||||
*nsec = r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2010 Lennart Poettering
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
typedef uint64_t usec_t;
|
||||
typedef uint64_t nsec_t;
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
typedef struct dual_timestamp {
|
||||
usec_t realtime;
|
||||
usec_t monotonic;
|
||||
} dual_timestamp;
|
||||
|
||||
#define MSEC_PER_SEC 1000ULL
|
||||
#define USEC_PER_SEC 1000000ULL
|
||||
#define USEC_PER_MSEC 1000ULL
|
||||
#define NSEC_PER_SEC 1000000000ULL
|
||||
#define NSEC_PER_MSEC 1000000ULL
|
||||
#define NSEC_PER_USEC 1000ULL
|
||||
|
||||
#define USEC_PER_MINUTE (60ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_MINUTE (60ULL*NSEC_PER_SEC)
|
||||
#define USEC_PER_HOUR (60ULL*USEC_PER_MINUTE)
|
||||
#define NSEC_PER_HOUR (60ULL*NSEC_PER_MINUTE)
|
||||
#define USEC_PER_DAY (24ULL*USEC_PER_HOUR)
|
||||
#define NSEC_PER_DAY (24ULL*NSEC_PER_HOUR)
|
||||
#define USEC_PER_WEEK (7ULL*USEC_PER_DAY)
|
||||
#define NSEC_PER_WEEK (7ULL*NSEC_PER_DAY)
|
||||
#define USEC_PER_MONTH (2629800ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_MONTH (2629800ULL*NSEC_PER_SEC)
|
||||
#define USEC_PER_YEAR (31557600ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_YEAR (31557600ULL*NSEC_PER_SEC)
|
||||
|
||||
#define FORMAT_TIMESTAMP_MAX (6+11+9+4+1)
|
||||
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
|
||||
#define FORMAT_TIMESPAN_MAX 64
|
||||
|
||||
usec_t now(clockid_t clock);
|
||||
|
||||
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
|
||||
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
|
||||
|
||||
#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
|
||||
|
||||
usec_t timespec_load(const struct timespec *ts);
|
||||
struct timespec *timespec_store(struct timespec *ts, usec_t u);
|
||||
|
||||
usec_t timeval_load(const struct timeval *tv);
|
||||
struct timeval *timeval_store(struct timeval *tv, usec_t u);
|
||||
|
||||
char *format_timestamp(char *buf, size_t l, usec_t t);
|
||||
char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
|
||||
char *format_timespan(char *buf, size_t l, usec_t t);
|
||||
|
||||
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
|
||||
void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
|
||||
|
||||
int parse_timestamp(const char *t, usec_t *usec);
|
||||
|
||||
int parse_usec(const char *t, usec_t *usec);
|
||||
int parse_nsec(const char *t, nsec_t *nsec);
|
||||
|
|
@ -108,105 +108,6 @@ bool streq_ptr(const char *a, const char *b) {
|
|||
return false;
|
||||
}
|
||||
|
||||
usec_t now(clockid_t clock_id) {
|
||||
struct timespec ts;
|
||||
|
||||
assert_se(clock_gettime(clock_id, &ts) == 0);
|
||||
|
||||
return timespec_load(&ts);
|
||||
}
|
||||
|
||||
dual_timestamp* dual_timestamp_get(dual_timestamp *ts) {
|
||||
assert(ts);
|
||||
|
||||
ts->realtime = now(CLOCK_REALTIME);
|
||||
ts->monotonic = now(CLOCK_MONOTONIC);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u) {
|
||||
int64_t delta;
|
||||
assert(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);
|
||||
|
||||
if ((int64_t) ts->monotonic > delta)
|
||||
ts->monotonic -= delta;
|
||||
else
|
||||
ts->monotonic = 0;
|
||||
}
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
usec_t timespec_load(const struct timespec *ts) {
|
||||
assert(ts);
|
||||
|
||||
if (ts->tv_sec == (time_t) -1 &&
|
||||
ts->tv_nsec == (long) -1)
|
||||
return (usec_t) -1;
|
||||
|
||||
if ((usec_t) ts->tv_sec > (UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / USEC_PER_SEC)
|
||||
return (usec_t) -1;
|
||||
|
||||
return
|
||||
(usec_t) ts->tv_sec * USEC_PER_SEC +
|
||||
(usec_t) ts->tv_nsec / NSEC_PER_USEC;
|
||||
}
|
||||
|
||||
struct timespec *timespec_store(struct timespec *ts, usec_t u) {
|
||||
assert(ts);
|
||||
|
||||
if (u == (usec_t) -1) {
|
||||
ts->tv_sec = (time_t) -1;
|
||||
ts->tv_nsec = (long) -1;
|
||||
return ts;
|
||||
}
|
||||
|
||||
ts->tv_sec = (time_t) (u / USEC_PER_SEC);
|
||||
ts->tv_nsec = (long int) ((u % USEC_PER_SEC) * NSEC_PER_USEC);
|
||||
|
||||
return ts;
|
||||
}
|
||||
|
||||
usec_t timeval_load(const struct timeval *tv) {
|
||||
assert(tv);
|
||||
|
||||
if (tv->tv_sec == (time_t) -1 &&
|
||||
tv->tv_usec == (suseconds_t) -1)
|
||||
return (usec_t) -1;
|
||||
|
||||
if ((usec_t) tv->tv_sec > (UINT64_MAX - tv->tv_usec) / USEC_PER_SEC)
|
||||
return (usec_t) -1;
|
||||
|
||||
return
|
||||
(usec_t) tv->tv_sec * USEC_PER_SEC +
|
||||
(usec_t) tv->tv_usec;
|
||||
}
|
||||
|
||||
struct timeval *timeval_store(struct timeval *tv, usec_t u) {
|
||||
assert(tv);
|
||||
|
||||
if (u == (usec_t) -1) {
|
||||
tv->tv_sec = (time_t) -1;
|
||||
tv->tv_usec = (suseconds_t) -1;
|
||||
return tv;
|
||||
}
|
||||
|
||||
tv->tv_sec = (time_t) (u / USEC_PER_SEC);
|
||||
tv->tv_usec = (suseconds_t) (u % USEC_PER_SEC);
|
||||
|
||||
return tv;
|
||||
}
|
||||
|
||||
char* endswith(const char *s, const char *postfix) {
|
||||
size_t sl, pl;
|
||||
|
||||
|
|
@ -1956,136 +1857,6 @@ bool chars_intersect(const char *a, const char *b) {
|
|||
return false;
|
||||
}
|
||||
|
||||
char *format_timestamp(char *buf, size_t l, usec_t t) {
|
||||
struct tm tm;
|
||||
time_t sec;
|
||||
|
||||
assert(buf);
|
||||
assert(l > 0);
|
||||
|
||||
if (t <= 0)
|
||||
return NULL;
|
||||
|
||||
sec = (time_t) (t / USEC_PER_SEC);
|
||||
|
||||
if (strftime(buf, l, "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&sec, &tm)) <= 0)
|
||||
return NULL;
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
char *format_timestamp_pretty(char *buf, size_t l, usec_t t) {
|
||||
usec_t n, d;
|
||||
|
||||
n = now(CLOCK_REALTIME);
|
||||
|
||||
if (t <= 0 || t > n || t + USEC_PER_DAY*7 <= t)
|
||||
return NULL;
|
||||
|
||||
d = n - t;
|
||||
|
||||
if (d >= USEC_PER_YEAR)
|
||||
snprintf(buf, l, "%llu years and %llu months ago",
|
||||
(unsigned long long) (d / USEC_PER_YEAR),
|
||||
(unsigned long long) ((d % USEC_PER_YEAR) / USEC_PER_MONTH));
|
||||
else if (d >= USEC_PER_MONTH)
|
||||
snprintf(buf, l, "%llu months and %llu days ago",
|
||||
(unsigned long long) (d / USEC_PER_MONTH),
|
||||
(unsigned long long) ((d % USEC_PER_MONTH) / USEC_PER_DAY));
|
||||
else if (d >= USEC_PER_WEEK)
|
||||
snprintf(buf, l, "%llu weeks and %llu days ago",
|
||||
(unsigned long long) (d / USEC_PER_WEEK),
|
||||
(unsigned long long) ((d % USEC_PER_WEEK) / USEC_PER_DAY));
|
||||
else if (d >= 2*USEC_PER_DAY)
|
||||
snprintf(buf, l, "%llu days ago", (unsigned long long) (d / USEC_PER_DAY));
|
||||
else if (d >= 25*USEC_PER_HOUR)
|
||||
snprintf(buf, l, "1 day and %lluh ago",
|
||||
(unsigned long long) ((d - USEC_PER_DAY) / USEC_PER_HOUR));
|
||||
else if (d >= 6*USEC_PER_HOUR)
|
||||
snprintf(buf, l, "%lluh ago",
|
||||
(unsigned long long) (d / USEC_PER_HOUR));
|
||||
else if (d >= USEC_PER_HOUR)
|
||||
snprintf(buf, l, "%lluh %llumin ago",
|
||||
(unsigned long long) (d / USEC_PER_HOUR),
|
||||
(unsigned long long) ((d % USEC_PER_HOUR) / USEC_PER_MINUTE));
|
||||
else if (d >= 5*USEC_PER_MINUTE)
|
||||
snprintf(buf, l, "%llumin ago",
|
||||
(unsigned long long) (d / USEC_PER_MINUTE));
|
||||
else if (d >= USEC_PER_MINUTE)
|
||||
snprintf(buf, l, "%llumin %llus ago",
|
||||
(unsigned long long) (d / USEC_PER_MINUTE),
|
||||
(unsigned long long) ((d % USEC_PER_MINUTE) / USEC_PER_SEC));
|
||||
else if (d >= USEC_PER_SEC)
|
||||
snprintf(buf, l, "%llus ago",
|
||||
(unsigned long long) (d / USEC_PER_SEC));
|
||||
else if (d >= USEC_PER_MSEC)
|
||||
snprintf(buf, l, "%llums ago",
|
||||
(unsigned long long) (d / USEC_PER_MSEC));
|
||||
else if (d > 0)
|
||||
snprintf(buf, l, "%lluus ago",
|
||||
(unsigned long long) d);
|
||||
else
|
||||
snprintf(buf, l, "now");
|
||||
|
||||
buf[l-1] = 0;
|
||||
return buf;
|
||||
}
|
||||
|
||||
char *format_timespan(char *buf, size_t l, usec_t t) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
usec_t usec;
|
||||
} table[] = {
|
||||
{ "w", USEC_PER_WEEK },
|
||||
{ "d", USEC_PER_DAY },
|
||||
{ "h", USEC_PER_HOUR },
|
||||
{ "min", USEC_PER_MINUTE },
|
||||
{ "s", USEC_PER_SEC },
|
||||
{ "ms", USEC_PER_MSEC },
|
||||
{ "us", 1 },
|
||||
};
|
||||
|
||||
unsigned i;
|
||||
char *p = buf;
|
||||
|
||||
assert(buf);
|
||||
assert(l > 0);
|
||||
|
||||
if (t == (usec_t) -1)
|
||||
return NULL;
|
||||
|
||||
if (t == 0) {
|
||||
snprintf(p, l, "0");
|
||||
p[l-1] = 0;
|
||||
return p;
|
||||
}
|
||||
|
||||
/* The result of this function can be parsed with parse_usec */
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++) {
|
||||
int k;
|
||||
size_t n;
|
||||
|
||||
if (t < table[i].usec)
|
||||
continue;
|
||||
|
||||
if (l <= 1)
|
||||
break;
|
||||
|
||||
k = snprintf(p, l, "%s%llu%s", p > buf ? " " : "", (unsigned long long) (t / table[i].usec), table[i].suffix);
|
||||
n = MIN((size_t) k, l);
|
||||
|
||||
l -= n;
|
||||
p += n;
|
||||
|
||||
t %= table[i].usec;
|
||||
}
|
||||
|
||||
*p = 0;
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
bool fstype_is_network(const char *fstype) {
|
||||
static const char table[] =
|
||||
"cifs\0"
|
||||
|
|
@ -2754,164 +2525,6 @@ ssize_t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
|
|||
return n;
|
||||
}
|
||||
|
||||
int parse_usec(const char *t, usec_t *usec) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
usec_t usec;
|
||||
} table[] = {
|
||||
{ "seconds", USEC_PER_SEC },
|
||||
{ "second", USEC_PER_SEC },
|
||||
{ "sec", USEC_PER_SEC },
|
||||
{ "s", USEC_PER_SEC },
|
||||
{ "minutes", USEC_PER_MINUTE },
|
||||
{ "minute", USEC_PER_MINUTE },
|
||||
{ "min", USEC_PER_MINUTE },
|
||||
{ "months", USEC_PER_MONTH },
|
||||
{ "month", USEC_PER_MONTH },
|
||||
{ "msec", USEC_PER_MSEC },
|
||||
{ "ms", USEC_PER_MSEC },
|
||||
{ "m", USEC_PER_MINUTE },
|
||||
{ "hours", USEC_PER_HOUR },
|
||||
{ "hour", USEC_PER_HOUR },
|
||||
{ "hr", USEC_PER_HOUR },
|
||||
{ "h", USEC_PER_HOUR },
|
||||
{ "days", USEC_PER_DAY },
|
||||
{ "day", USEC_PER_DAY },
|
||||
{ "d", USEC_PER_DAY },
|
||||
{ "weeks", USEC_PER_WEEK },
|
||||
{ "week", USEC_PER_WEEK },
|
||||
{ "w", USEC_PER_WEEK },
|
||||
{ "years", USEC_PER_YEAR },
|
||||
{ "year", USEC_PER_YEAR },
|
||||
{ "y", USEC_PER_YEAR },
|
||||
{ "usec", 1ULL },
|
||||
{ "us", 1ULL },
|
||||
{ "", USEC_PER_SEC }, /* default is sec */
|
||||
};
|
||||
|
||||
const char *p;
|
||||
usec_t r = 0;
|
||||
|
||||
assert(t);
|
||||
assert(usec);
|
||||
|
||||
p = t;
|
||||
do {
|
||||
long long l;
|
||||
char *e;
|
||||
unsigned i;
|
||||
|
||||
errno = 0;
|
||||
l = strtoll(p, &e, 10);
|
||||
|
||||
if (errno != 0)
|
||||
return -errno;
|
||||
|
||||
if (l < 0)
|
||||
return -ERANGE;
|
||||
|
||||
if (e == p)
|
||||
return -EINVAL;
|
||||
|
||||
e += strspn(e, WHITESPACE);
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++)
|
||||
if (startswith(e, table[i].suffix)) {
|
||||
r += (usec_t) l * table[i].usec;
|
||||
p = e + strlen(table[i].suffix);
|
||||
break;
|
||||
}
|
||||
|
||||
if (i >= ELEMENTSOF(table))
|
||||
return -EINVAL;
|
||||
|
||||
} while (*p != 0);
|
||||
|
||||
*usec = r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_nsec(const char *t, nsec_t *nsec) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
nsec_t nsec;
|
||||
} table[] = {
|
||||
{ "seconds", NSEC_PER_SEC },
|
||||
{ "second", NSEC_PER_SEC },
|
||||
{ "sec", NSEC_PER_SEC },
|
||||
{ "s", NSEC_PER_SEC },
|
||||
{ "minutes", NSEC_PER_MINUTE },
|
||||
{ "minute", NSEC_PER_MINUTE },
|
||||
{ "min", NSEC_PER_MINUTE },
|
||||
{ "months", NSEC_PER_MONTH },
|
||||
{ "month", NSEC_PER_MONTH },
|
||||
{ "msec", NSEC_PER_MSEC },
|
||||
{ "ms", NSEC_PER_MSEC },
|
||||
{ "m", NSEC_PER_MINUTE },
|
||||
{ "hours", NSEC_PER_HOUR },
|
||||
{ "hour", NSEC_PER_HOUR },
|
||||
{ "hr", NSEC_PER_HOUR },
|
||||
{ "h", NSEC_PER_HOUR },
|
||||
{ "days", NSEC_PER_DAY },
|
||||
{ "day", NSEC_PER_DAY },
|
||||
{ "d", NSEC_PER_DAY },
|
||||
{ "weeks", NSEC_PER_WEEK },
|
||||
{ "week", NSEC_PER_WEEK },
|
||||
{ "w", NSEC_PER_WEEK },
|
||||
{ "years", NSEC_PER_YEAR },
|
||||
{ "year", NSEC_PER_YEAR },
|
||||
{ "y", NSEC_PER_YEAR },
|
||||
{ "usec", NSEC_PER_USEC },
|
||||
{ "us", NSEC_PER_USEC },
|
||||
{ "nsec", 1ULL },
|
||||
{ "ns", 1ULL },
|
||||
{ "", 1ULL }, /* default is nsec */
|
||||
};
|
||||
|
||||
const char *p;
|
||||
nsec_t r = 0;
|
||||
|
||||
assert(t);
|
||||
assert(nsec);
|
||||
|
||||
p = t;
|
||||
do {
|
||||
long long l;
|
||||
char *e;
|
||||
unsigned i;
|
||||
|
||||
errno = 0;
|
||||
l = strtoll(p, &e, 10);
|
||||
|
||||
if (errno != 0)
|
||||
return -errno;
|
||||
|
||||
if (l < 0)
|
||||
return -ERANGE;
|
||||
|
||||
if (e == p)
|
||||
return -EINVAL;
|
||||
|
||||
e += strspn(e, WHITESPACE);
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(table); i++)
|
||||
if (startswith(e, table[i].suffix)) {
|
||||
r += (nsec_t) l * table[i].nsec;
|
||||
p = e + strlen(table[i].suffix);
|
||||
break;
|
||||
}
|
||||
|
||||
if (i >= ELEMENTSOF(table))
|
||||
return -EINVAL;
|
||||
|
||||
} while (*p != 0);
|
||||
|
||||
*nsec = r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int parse_bytes(const char *t, off_t *bytes) {
|
||||
static const struct {
|
||||
const char *suffix;
|
||||
|
|
@ -4120,35 +3733,6 @@ int signal_from_string_try_harder(const char *s) {
|
|||
return signo;
|
||||
}
|
||||
|
||||
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t) {
|
||||
|
||||
assert(f);
|
||||
assert(name);
|
||||
assert(t);
|
||||
|
||||
if (!dual_timestamp_is_set(t))
|
||||
return;
|
||||
|
||||
fprintf(f, "%s=%llu %llu\n",
|
||||
name,
|
||||
(unsigned long long) t->realtime,
|
||||
(unsigned long long) t->monotonic);
|
||||
}
|
||||
|
||||
void dual_timestamp_deserialize(const char *value, dual_timestamp *t) {
|
||||
unsigned long long a, b;
|
||||
|
||||
assert(value);
|
||||
assert(t);
|
||||
|
||||
if (sscanf(value, "%lli %llu", &a, &b) != 2)
|
||||
log_debug("Failed to parse finish timestamp value %s", value);
|
||||
else {
|
||||
t->realtime = a;
|
||||
t->monotonic = b;
|
||||
}
|
||||
}
|
||||
|
||||
static char *tag_to_udev_node(const char *tagvalue, const char *by) {
|
||||
char *dn, *t, *u;
|
||||
int r;
|
||||
|
|
@ -5968,139 +5552,6 @@ bool string_is_safe(const char *p) {
|
|||
return true;
|
||||
}
|
||||
|
||||
int parse_timestamp(const char *t, usec_t *usec) {
|
||||
const char *k;
|
||||
struct tm tm, copy;
|
||||
time_t x;
|
||||
usec_t plus = 0, minus = 0, ret;
|
||||
int r;
|
||||
|
||||
/*
|
||||
* Allowed syntaxes:
|
||||
*
|
||||
* 2012-09-22 16:34:22
|
||||
* 2012-09-22 16:34 (seconds will be set to 0)
|
||||
* 2012-09-22 (time will be set to 00:00:00)
|
||||
* 16:34:22 (date will be set to today)
|
||||
* 16:34 (date will be set to today, seconds to 0)
|
||||
* now
|
||||
* yesterday (time is set to 00:00:00)
|
||||
* today (time is set to 00:00:00)
|
||||
* tomorrow (time is set to 00:00:00)
|
||||
* +5min
|
||||
* -5days
|
||||
*
|
||||
*/
|
||||
|
||||
assert(t);
|
||||
assert(usec);
|
||||
|
||||
x = time(NULL);
|
||||
assert_se(localtime_r(&x, &tm));
|
||||
|
||||
if (streq(t, "now"))
|
||||
goto finish;
|
||||
|
||||
else if (streq(t, "today")) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (streq(t, "yesterday")) {
|
||||
tm.tm_mday --;
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (streq(t, "tomorrow")) {
|
||||
tm.tm_mday ++;
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
|
||||
} else if (t[0] == '+') {
|
||||
|
||||
r = parse_usec(t+1, &plus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
goto finish;
|
||||
} else if (t[0] == '-') {
|
||||
|
||||
r = parse_usec(t+1, &minus);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
goto finish;
|
||||
}
|
||||
|
||||
copy = tm;
|
||||
k = strptime(t, "%y-%m-%d %H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d %H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%y-%m-%d %H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d %H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%y-%m-%d", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%Y-%m-%d", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = tm.tm_min = tm.tm_hour = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%H:%M:%S", &tm);
|
||||
if (k && *k == 0)
|
||||
goto finish;
|
||||
|
||||
tm = copy;
|
||||
k = strptime(t, "%H:%M", &tm);
|
||||
if (k && *k == 0) {
|
||||
tm.tm_sec = 0;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
|
||||
finish:
|
||||
x = mktime(&tm);
|
||||
if (x == (time_t) -1)
|
||||
return -EINVAL;
|
||||
|
||||
ret = (usec_t) x * USEC_PER_SEC;
|
||||
|
||||
ret += plus;
|
||||
if (ret > minus)
|
||||
ret -= minus;
|
||||
else
|
||||
ret = 0;
|
||||
|
||||
*usec = ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* hey glibc, APIs with callbacks without a user pointer are so useless */
|
||||
void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
|
||||
int (*compar) (const void *, const void *, void *), void *arg) {
|
||||
|
|
|
|||
|
|
@ -38,14 +38,7 @@
|
|||
#include <stddef.h>
|
||||
|
||||
#include "macro.h"
|
||||
|
||||
typedef uint64_t usec_t;
|
||||
typedef uint64_t nsec_t;
|
||||
|
||||
typedef struct dual_timestamp {
|
||||
usec_t realtime;
|
||||
usec_t monotonic;
|
||||
} dual_timestamp;
|
||||
#include "time-util.h"
|
||||
|
||||
union dirent_storage {
|
||||
struct dirent de;
|
||||
|
|
@ -53,25 +46,6 @@ union dirent_storage {
|
|||
((NAME_MAX + 1 + sizeof(long)) & ~(sizeof(long) - 1))];
|
||||
};
|
||||
|
||||
#define MSEC_PER_SEC 1000ULL
|
||||
#define USEC_PER_SEC 1000000ULL
|
||||
#define USEC_PER_MSEC 1000ULL
|
||||
#define NSEC_PER_SEC 1000000000ULL
|
||||
#define NSEC_PER_MSEC 1000000ULL
|
||||
#define NSEC_PER_USEC 1000ULL
|
||||
|
||||
#define USEC_PER_MINUTE (60ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_MINUTE (60ULL*NSEC_PER_SEC)
|
||||
#define USEC_PER_HOUR (60ULL*USEC_PER_MINUTE)
|
||||
#define NSEC_PER_HOUR (60ULL*NSEC_PER_MINUTE)
|
||||
#define USEC_PER_DAY (24ULL*USEC_PER_HOUR)
|
||||
#define NSEC_PER_DAY (24ULL*NSEC_PER_HOUR)
|
||||
#define USEC_PER_WEEK (7ULL*USEC_PER_DAY)
|
||||
#define NSEC_PER_WEEK (7ULL*NSEC_PER_DAY)
|
||||
#define USEC_PER_MONTH (2629800ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_MONTH (2629800ULL*NSEC_PER_SEC)
|
||||
#define USEC_PER_YEAR (31557600ULL*USEC_PER_SEC)
|
||||
#define NSEC_PER_YEAR (31557600ULL*NSEC_PER_SEC)
|
||||
|
||||
/* What is interpreted as whitespace? */
|
||||
#define WHITESPACE " \t\n\r"
|
||||
|
|
@ -79,9 +53,6 @@ union dirent_storage {
|
|||
#define QUOTES "\"\'"
|
||||
#define COMMENTS "#;\n"
|
||||
|
||||
#define FORMAT_TIMESTAMP_MAX (6+11+9+4+1)
|
||||
#define FORMAT_TIMESTAMP_PRETTY_MAX 256
|
||||
#define FORMAT_TIMESPAN_MAX 64
|
||||
#define FORMAT_BYTES_MAX 8
|
||||
|
||||
#define ANSI_HIGHLIGHT_ON "\x1B[1;39m"
|
||||
|
|
@ -92,19 +63,6 @@ union dirent_storage {
|
|||
|
||||
bool is_efiboot(void);
|
||||
|
||||
usec_t now(clockid_t clock);
|
||||
|
||||
dual_timestamp* dual_timestamp_get(dual_timestamp *ts);
|
||||
dual_timestamp* dual_timestamp_from_realtime(dual_timestamp *ts, usec_t u);
|
||||
|
||||
#define dual_timestamp_is_set(ts) ((ts)->realtime > 0)
|
||||
|
||||
usec_t timespec_load(const struct timespec *ts);
|
||||
struct timespec *timespec_store(struct timespec *ts, usec_t u);
|
||||
|
||||
usec_t timeval_load(const struct timeval *tv);
|
||||
struct timeval *timeval_store(struct timeval *tv, usec_t u);
|
||||
|
||||
size_t page_size(void);
|
||||
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
|
||||
|
||||
|
|
@ -154,8 +112,6 @@ void close_nointr_nofail(int fd);
|
|||
void close_many(const int fds[], unsigned n_fd);
|
||||
|
||||
int parse_boolean(const char *v);
|
||||
int parse_usec(const char *t, usec_t *usec);
|
||||
int parse_nsec(const char *t, nsec_t *nsec);
|
||||
int parse_bytes(const char *t, off_t *bytes);
|
||||
int parse_pid(const char *s, pid_t* ret_pid);
|
||||
int parse_uid(const char *s, uid_t* ret_uid);
|
||||
|
|
@ -283,10 +239,6 @@ bool ignore_file(const char *filename);
|
|||
|
||||
bool chars_intersect(const char *a, const char *b);
|
||||
|
||||
char *format_timestamp(char *buf, size_t l, usec_t t);
|
||||
char *format_timestamp_pretty(char *buf, size_t l, usec_t t);
|
||||
char *format_timespan(char *buf, size_t l, usec_t t);
|
||||
|
||||
int make_stdio(int fd);
|
||||
int make_null_stdio(void);
|
||||
int make_console_stdio(void);
|
||||
|
|
@ -442,9 +394,6 @@ int null_or_empty_path(const char *fn);
|
|||
|
||||
DIR *xopendirat(int dirfd, const char *name, int flags);
|
||||
|
||||
void dual_timestamp_serialize(FILE *f, const char *name, dual_timestamp *t);
|
||||
void dual_timestamp_deserialize(const char *value, dual_timestamp *t);
|
||||
|
||||
char *fstab_node_to_udev_node(const char *p);
|
||||
|
||||
bool tty_is_vc(const char *tty);
|
||||
|
|
@ -595,8 +544,6 @@ _malloc_ static inline void *memdup_multiply(const void *p, size_t a, size_t b)
|
|||
bool filename_is_safe(const char *p);
|
||||
bool string_is_safe(const char *p);
|
||||
|
||||
int parse_timestamp(const char *t, usec_t *usec);
|
||||
|
||||
void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
|
||||
int (*compar) (const void *, const void *, void *),
|
||||
void *arg);
|
||||
|
|
|
|||
Loading…
Reference in New Issue