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

Merge pull request #5429 from GiedriusS/master

Browse source 
coredumpctl: implement --since/--until (-S/-U) for info/list verbs
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-24 21:35:38 -05:00 committed by GitHub
parent 78e4f19ebc 15710d4479
commit 5a36dddca3
4 changed files with 85 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
man/coredumpctl.xml
View file

@ -91,6 +91,20 @@
all known core dumps.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-S</option></term>
<term><option>--since</option></term>
<listitem><para>Only print entries which are since the specified date.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-U</option></term>
<term><option>--until</option></term>
<listitem><para>Only print entries which are until the specified date.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-r</option></term>
<term><option>--reverse</option></term>

2
shell-completion/bash/coredumpctl
View file

@ -38,7 +38,7 @@ _coredumpctl() {
local i verb comps
local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
local OPTS='-h --help --version --no-pager --no-legend -o --output -F --field -1
-r --reverse'
-r --reverse -S --since -U --until'
local -A VERBS=(
[LIST]='list'

2
shell-completion/zsh/_coredumpctl
View file

@ -32,6 +32,8 @@ _arguments \
{-o+,--output=}'[Write output to FILE]:output file:_files' \
{-F+,--field=}'[Show field in list output]:field' \
'-1[Show information about most recent entry only]' \
{-S,--since}'[Print entries since the specified date]' \
{-U,--until}'[Print entries until the specified date]' \
{-r,--reverse}'[Show the newest entries first]' \
'--no-pager[Do not pipe output into a pager]' \
'--no-legend[Do not print the column headers]' \

80
src/coredump/coredumpctl.c
View file

@ -50,6 +50,8 @@
#include "user-util.h"
#include "util.h"
static usec_t arg_since = USEC_INFINITY, arg_until = USEC_INFINITY;
static enum {
ACTION_NONE,
ACTION_INFO,
@ -128,11 +130,12 @@ static void help(void) {
" --no-pager Do not pipe output into a pager\n"
" --no-legend Do not print the column headers.\n"
" -1 Show information about most recent entry only\n"
" -S --since=DATE Only print coredumps since the date\n"
" -U --until=DATE Only print coredumps until the date\n"
" -r --reverse Show the newest entries first\n"
" -F --field=FIELD List all values a certain field takes\n"
" -o --output=FILE Write output to FILE\n"
" -D --directory=DIR Use journal files from directory\n\n"
"Commands:\n"
" list [MATCHES...] List available coredumps (default)\n"
" info [MATCHES...] Show detailed information about one or more coredumps\n"
@ -148,7 +151,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_NO_LEGEND,
};
int c;
int c, r;
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
@ -159,15 +162,16 @@ static int parse_argv(int argc, char *argv[]) {
{ "field", required_argument, NULL, 'F' },
{ "directory", required_argument, NULL, 'D' },
{ "reverse", no_argument, NULL, 'r' },
{ "since", required_argument, NULL, 'S' },
{ "until", required_argument, NULL, 'U' },
{}
};
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "ho:F:1D:r", options, NULL)) >= 0)
while ((c = getopt_long(argc, argv, "ho:F:1D:S:U:r", options, NULL)) >= 0)
switch(c) {
case 'h':
arg_action = ACTION_NONE;
help();
@ -197,6 +201,18 @@ static int parse_argv(int argc, char *argv[]) {
break;
case 'S':
r = parse_timestamp(optarg, &arg_since);
if (r < 0)
return log_error_errno(r, "Failed to parse timestamp: %s", optarg);
break;
case 'U':
r = parse_timestamp(optarg, &arg_until);
if (r < 0)
return log_error_errno(r, "Failed to parse timestamp: %s", optarg);
break;
case 'F':
if (arg_field) {
log_error("cannot use --field/-F more than once");
@ -224,6 +240,12 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached("Unhandled option");
}
if (arg_since != USEC_INFINITY && arg_until != USEC_INFINITY &&
arg_since > arg_until) {
log_error("--since= must be before --until=.");
return -EINVAL;
}
if (optind < argc) {
const char *cmd = argv[optind++];
if (streq(cmd, "list"))
@ -610,18 +632,52 @@ static int dump_list(sd_journal *j) {
return print_entry(j, 0);
} else {
if (!arg_reverse) {
SD_JOURNAL_FOREACH(j) {
r = print_entry(j, n_found++);
if (arg_since != USEC_INFINITY && !arg_reverse)
r = sd_journal_seek_realtime_usec(j, arg_since);
else if (arg_until != USEC_INFINITY && arg_reverse)
r = sd_journal_seek_realtime_usec(j, arg_until);
else if (arg_reverse)
r = sd_journal_seek_tail(j);
else
r = sd_journal_seek_head(j);
if (r < 0)
return log_error_errno(r, "Failed to seek to date: %m");
for (;;) {
if (!arg_reverse)
r = sd_journal_next(j);
else
r = sd_journal_previous(j);
if (r < 0)
return log_error_errno(r, "Failed to iterate through journal: %m");
if (r == 0)
break;
if (arg_until != USEC_INFINITY && !arg_reverse) {
usec_t usec;
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0)
return r;
return log_error_errno(r, "Failed to determine timestamp: %m");
if (usec > arg_until)
continue;
}
} else {
SD_JOURNAL_FOREACH_BACKWARDS(j) {
r = print_entry(j, n_found++);
if (arg_since != USEC_INFINITY && arg_reverse) {
usec_t usec;
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0)
return r;
return log_error_errno(r, "Failed to determine timestamp: %m");
if (usec < arg_since)
continue;
}
r = print_entry(j, n_found++);
if (r < 0)
return r;
}
if (!arg_field && n_found <= 0) {