shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-15 23:24:12 +03:00
Code

analyze: format output of 'systemd-analyze calendar' by using Table

Browse Source
This commit is contained in:
Yu Watanabe 2019-07-16 00:45:05 +09:00
parent c5bbb2b5be
commit 9c712cf285
1 changed files with 93 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
src/analyze/analyze.c
View File

@ -1796,7 +1796,9 @@ static int test_timestamp(int argc, char *argv[], void *userdata) {
static int test_calendar_one(usec_t n, const char *p) { static int test_calendar_one(usec_t n, const char *p) {
_cleanup_(calendar_spec_freep) CalendarSpec *spec = NULL; _cleanup_(calendar_spec_freep) CalendarSpec *spec = NULL;
_cleanup_(table_unrefp) Table *table = NULL;
_cleanup_free_ char *t = NULL; _cleanup_free_ char *t = NULL;
TableCell *cell;
int r; int r;
r = calendar_spec_from_string(p, &spec); r = calendar_spec_from_string(p, &spec);
@ -1810,30 +1812,80 @@ static int test_calendar_one(usec_t n, const char *p) {
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to format calendar specification '%s': %m", p); return log_error_errno(r, "Failed to format calendar specification '%s': %m", p);
if (!streq(t, p)) table = table_new("NAME", "VALUE");
printf(" Original form: %s\n", p); if (!table)
return log_oom();
printf("Normalized form: %s\n", t); table_set_header(table, false);
assert_se(cell = table_get_cell(table, 0, 0));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
r = table_set_align_percent(table, cell, 100);
if (r < 0)
return r;
assert_se(cell = table_get_cell(table, 0, 1));
r = table_set_ellipsize_percent(table, cell, 100);
if (r < 0)
return r;
if (!streq(t, p)) {
r = table_add_cell(table, NULL, TABLE_STRING, "Original form:");
if (r < 0)
return r;
r = table_add_cell(table, NULL, TABLE_STRING, p);
if (r < 0)
return r;
}
r = table_add_cell(table, NULL, TABLE_STRING, "Normalized form:");
if (r < 0)
return r;
r = table_add_cell(table, NULL, TABLE_STRING, t);
if (r < 0)
return r;
for (unsigned i = 0; i < arg_iterations; i++) { for (unsigned i = 0; i < arg_iterations; i++) {
char buffer[CONST_MAX(FORMAT_TIMESTAMP_MAX, FORMAT_TIMESTAMP_RELATIVE_MAX)];
usec_t next; usec_t next;
r = calendar_spec_next_usec(spec, n, &next); r = calendar_spec_next_usec(spec, n, &next);
if (r == -ENOENT) { if (r == -ENOENT) {
if (i == 0) if (i == 0) {
printf(" Next elapse: %snever%s\n", ansi_highlight_yellow(), ansi_normal()); r = table_add_cell(table, NULL, TABLE_STRING, "Next elapse:");
return 0; if (r < 0)
return r;
r = table_add_cell(table, &cell, TABLE_STRING, "never");
if (r < 0)
return r;
r = table_set_color(table, cell, ansi_highlight_yellow());
if (r < 0)
return r;
}
break;
} }
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to determine next elapse for '%s': %m", p); return log_error_errno(r, "Failed to determine next elapse for '%s': %m", p);
if (i == 0) if (i == 0) {
printf(" Next elapse: %s%s%s\n", r = table_add_cell(table, NULL, TABLE_STRING, "Next elapse:");
ansi_highlight_blue(), if (r < 0)
format_timestamp(buffer, sizeof(buffer), next), return r;
ansi_normal());
else { r = table_add_cell(table, &cell, TABLE_TIMESTAMP, &next);
if (r < 0)
return r;
r = table_set_color(table, cell, ansi_highlight_blue());
if (r < 0)
return r;
} else {
int k = DECIMAL_STR_WIDTH(i + 1); int k = DECIMAL_STR_WIDTH(i + 1);
if (k < 8) if (k < 8)
@ -1841,20 +1893,41 @@ static int test_calendar_one(usec_t n, const char *p) {
else else
k = 0; k = 0;
printf("%*sIter. #%u: %s%s%s\n", r = table_add_cell_stringf(table, NULL, "Iter. #%u:", i+1);
k, "", i+1, if (r < 0)
ansi_highlight_blue(), format_timestamp(buffer, sizeof(buffer), next), ansi_normal()); return r;
r = table_add_cell(table, &cell, TABLE_TIMESTAMP, &next);
if (r < 0)
return r;
r = table_set_color(table, cell, ansi_highlight_blue());
if (r < 0)
return r;
} }
if (!in_utc_timezone()) if (!in_utc_timezone()) {
printf(" (in UTC): %s\n", format_timestamp_utc(buffer, sizeof(buffer), next)); r = table_add_cell(table, NULL, TABLE_STRING, "(in UTC):");
if (r < 0)
return r;
printf(" From now: %s\n", format_timestamp_relative(buffer, sizeof(buffer), next)); r = table_add_cell(table, NULL, TABLE_TIMESTAMP_UTC, &next);
if (r < 0)
return r;
}
r = table_add_cell(table, NULL, TABLE_STRING, "From now:");
if (r < 0)
return r;
r = table_add_cell(table, NULL, TABLE_TIMESTAMP_RELATIVE, &next);
if (r < 0)
return r;
n = next; n = next;
} }
return 0; return table_print(table, NULL);
} }
static int test_calendar(int argc, char *argv[], void *userdata) { static int test_calendar(int argc, char *argv[], void *userdata) {