morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34672 from yuwata/timestamp

Browse Source 
analyze: fix timestamp
This commit is contained in:
Luca Boccassi
2024-10-08 19:21:28 +01:00
committed by GitHub
parent 945ace18b4 483db6867a
commit d07e1e07fe
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/analyze/analyze-calendar.c
View File

@@ -126,11 +126,7 @@ int verb_calendar(int argc, char *argv[], void *userdata) {
n = now(CLOCK_REALTIME); /* We want to use the same "base" for all expressions */
STRV_FOREACH(p, strv_skip(argv, 1)) {
int k;
k = test_calendar_one(n, *p);
if (r == 0 && k < 0)
r = k;
RET_GATHER(r, test_calendar_one(n, *p));
if (p[1])
putchar('\n');

6
src/analyze/analyze-timestamp.c
View File

@@ -76,11 +76,7 @@ int verb_timestamp(int argc, char *argv[], void *userdata) {
int r = 0;
STRV_FOREACH(p, strv_skip(argv, 1)) {
int k;
k = test_timestamp_one(*p);
if (r == 0 && k < 0)
r = k;
RET_GATHER(r, test_timestamp_one(*p));
if (p[1])
putchar('\n');

16
src/basic/time-util.c
View File

@@ -994,8 +994,12 @@ int parse_timestamp(const char *t, usec_t *ret) {
assert(t);
t_len = strlen(t);
if (t_len > 2 && t[t_len - 1] == 'Z' && t[t_len - 2] != ' ') /* RFC3339-style welded UTC: "1985-04-12T23:20:50.52Z" */
return parse_timestamp_impl(t, t_len - 1, /* utc = */ true, /* isdst = */ -1, /* gmtoff = */ 0, ret);
if (t_len > 2 && t[t_len - 1] == 'Z') {
/* Try to parse as RFC3339-style welded UTC: "1985-04-12T23:20:50.52Z" */
r = parse_timestamp_impl(t, t_len - 1, /* utc = */ true, /* isdst = */ -1, /* gmtoff = */ 0, ret);
if (r >= 0)
return r;
}
if (t_len > 7 && IN_SET(t[t_len - 6], '+', '-') && t[t_len - 7] != ' ') { /* RFC3339-style welded offset: "1990-12-31T15:59:60-08:00" */
k = strptime(&t[t_len - 6], "%z", &tm);
@@ -1039,6 +1043,14 @@ int parse_timestamp(const char *t, usec_t *ret) {
if (shared == MAP_FAILED)
return negative_errno();
/* The input string may be in argv. Let's copy it. */
_cleanup_free_ char *t_copy = strdup(t);
if (!t_copy)
return -ENOMEM;
t = t_copy;
assert_se(tz = endswith(t_copy, tz));
r = safe_fork("(sd-timestamp)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGKILL|FORK_WAIT, NULL);
if (r < 0) {
(void) munmap(shared, sizeof *shared);

31
src/test/test-time-util.c
View File

@@ -857,6 +857,29 @@ static void test_parse_timestamp_impl(const char *tz) {
test_parse_timestamp_one("69-12-31 19:00:01.0010 EST", 0, USEC_PER_SEC + 1000);
}
if (timezone_is_valid("NZ", LOG_DEBUG)) {
/* NZ (+1200) */
test_parse_timestamp_one("Thu 1970-01-01 12:01 NZ", 0, USEC_PER_MINUTE);
test_parse_timestamp_one("Thu 1970-01-01 12:00:01 NZ", 0, USEC_PER_SEC);
test_parse_timestamp_one("Thu 1970-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("Thu 1970-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("Thu 70-01-01 12:01 NZ", 0, USEC_PER_MINUTE);
test_parse_timestamp_one("Thu 70-01-01 12:00:01 NZ", 0, USEC_PER_SEC);
test_parse_timestamp_one("Thu 70-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("Thu 70-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("1970-01-01 12:01 NZ", 0, USEC_PER_MINUTE);
test_parse_timestamp_one("1970-01-01 12:00:01 NZ", 0, USEC_PER_SEC);
test_parse_timestamp_one("1970-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("1970-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("70-01-01 12:01 NZ", 0, USEC_PER_MINUTE);
test_parse_timestamp_one("70-01-01 12:00:01 NZ", 0, USEC_PER_SEC);
test_parse_timestamp_one("70-01-01 12:00:01.001 NZ", 0, USEC_PER_SEC + 1000);
test_parse_timestamp_one("70-01-01 12:00:01.0010 NZ", 0, USEC_PER_SEC + 1000);
}
/* -06 */
test_parse_timestamp_one("Wed 1969-12-31 18:01 -06", 0, USEC_PER_MINUTE);
test_parse_timestamp_one("Wed 1969-12-31 18:00:01 -06", 0, USEC_PER_SEC);
@@ -934,6 +957,14 @@ static void test_parse_timestamp_impl(const char *tz) {
test_parse_timestamp_one("yesterday", 0, today - USEC_PER_DAY);
}
/* with timezone */
if (tz) {
_cleanup_free_ char *s = NULL;
ASSERT_NOT_NULL(s = strjoin("Fri 2012-11-23 23:02:15 ", tz));
ASSERT_OK(parse_timestamp(s, NULL));
}
/* relative */
assert_se(parse_timestamp("now", &now_usec) == 0);
test_parse_timestamp_one("+5hours", USEC_PER_MINUTE, now_usec + 5 * USEC_PER_HOUR);

7
test/units/TEST-65-ANALYZE.sh
View File

@@ -172,6 +172,13 @@ systemd-analyze calendar --base-time=yesterday --iterations=5 '*-* *:*:*'
systemd-analyze timestamp now
systemd-analyze timestamp -- -1
systemd-analyze timestamp yesterday now tomorrow
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15'
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15 UTC'
systemd-analyze timestamp 'Fri 2012-11-23 23:02:15 CET'
for i in $(timedatectl list-timezones); do
[[ -e "/usr/share/zoneinfo/$i" ]] || continue
systemd-analyze timestamp "Fri 2012-11-23 23:02:15 $i"
done
(! systemd-analyze timestamp yesterday never tomorrow)
(! systemd-analyze timestamp 1)
(! systemd-analyze timestamp '*-2-29 0:0:0')