chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
STRV_FOREACH_BACWARDS: start at the tail of the list
[elogind.git]
/
src
/
journal
/
coredumpctl.c
diff --git
a/src/journal/coredumpctl.c
b/src/journal/coredumpctl.c
index 4adc9236f1fd3428d6f98ea3725a21e927a8f84f..75c96cc08112e41fff61c2181ba463dcfaf4bcaa 100644
(file)
--- a/
src/journal/coredumpctl.c
+++ b/
src/journal/coredumpctl.c
@@
-34,6
+34,8
@@
#include "log.h"
#include "path-util.h"
#include "pager.h"
#include "log.h"
#include "path-util.h"
#include "pager.h"
+#include "macro.h"
+#include "journal-internal.h"
static enum {
ACTION_NONE,
static enum {
ACTION_NONE,
@@
-42,7
+44,6
@@
static enum {
ACTION_GDB,
} arg_action = ACTION_LIST;
ACTION_GDB,
} arg_action = ACTION_LIST;
-static Set *matches = NULL;
static FILE* output = NULL;
static char* field = NULL;
static FILE* output = NULL;
static char* field = NULL;
@@
-67,10
+68,9
@@
static Set *new_matches(void) {
return NULL;
}
return NULL;
}
- r = set_
put
(set, tmp);
+ r = set_
consume
(set, tmp);
if (r < 0) {
log_error("failed to add to set: %s", strerror(-r));
if (r < 0) {
log_error("failed to add to set: %s", strerror(-r));
- free(tmp);
set_free(set);
return NULL;
}
set_free(set);
return NULL;
}
@@
-84,6
+84,7
@@
static int help(void) {
"Flags:\n"
" -o --output=FILE Write output to FILE\n"
" --no-pager Do not pipe output into a pager\n"
"Flags:\n"
" -o --output=FILE Write output to FILE\n"
" --no-pager Do not pipe output into a pager\n"
+ " --no-legend Do not print the column headers.\n\n"
"Commands:\n"
" -h --help Show this help\n"
"Commands:\n"
" -h --help Show this help\n"
@@
-103,7
+104,7
@@
static int add_match(Set *set, const char *match) {
unsigned pid;
const char* prefix;
char *pattern = NULL;
unsigned pid;
const char* prefix;
char *pattern = NULL;
-
char _cleanup_free_
*p = NULL;
+
_cleanup_free_ char
*p = NULL;
if (strchr(match, '='))
prefix = "";
if (strchr(match, '='))
prefix = "";
@@
-124,22
+125,21
@@
static int add_match(Set *set, const char *match) {
if (!pattern)
goto fail;
if (!pattern)
goto fail;
- r = set_put(set, pattern);
+ log_debug("Adding pattern: %s", pattern);
+ r = set_consume(set, pattern);
if (r < 0) {
if (r < 0) {
- log_error("
f
ailed to add pattern '%s': %s",
+ log_error("
F
ailed to add pattern '%s': %s",
pattern, strerror(-r));
goto fail;
}
pattern, strerror(-r));
goto fail;
}
- log_debug("Added pattern: %s", pattern);
return 0;
fail:
return 0;
fail:
- free(pattern);
- log_error("failed to add match: %s", strerror(-r));
+ log_error("Failed to add match: %s", strerror(-r));
return r;
}
return r;
}
-static int parse_argv(int argc, char *argv[]) {
+static int parse_argv(int argc, char *argv[]
, Set *matches
) {
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
enum {
ARG_VERSION = 0x100,
ARG_NO_PAGER,
@@
-170,7
+170,6
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
arg_action = ACTION_NONE;
return 0;
puts(SYSTEMD_FEATURES);
arg_action = ACTION_NONE;
return 0;
@@
-262,14
+261,14
@@
static int retrieve(const void *data,
return 0;
*var = strndup((const char*)data + ident, len - ident);
return 0;
*var = strndup((const char*)data + ident, len - ident);
- if (!var)
+ if (!
*
var)
return log_oom();
return 0;
}
static void print_field(FILE* file, sd_journal *j) {
return log_oom();
return 0;
}
static void print_field(FILE* file, sd_journal *j) {
-
const char _cleanup_free_
*value = NULL;
+
_cleanup_free_ const char
*value = NULL;
const void *d;
size_t l;
const void *d;
size_t l;
@@
-282,7
+281,7
@@
static void print_field(FILE* file, sd_journal *j) {
}
static int print_entry(FILE* file, sd_journal *j, int had_legend) {
}
static int print_entry(FILE* file, sd_journal *j, int had_legend) {
- const char _cleanup_free_
+ _cleanup_free_ const char
*pid = NULL, *uid = NULL, *gid = NULL,
*sgnl = NULL, *exe = NULL;
const void *d;
*pid = NULL, *uid = NULL, *gid = NULL,
*sgnl = NULL, *exe = NULL;
const void *d;
@@
-342,6
+341,11
@@
static int dump_list(sd_journal *j) {
assert(j);
assert(j);
+ /* The coredumps are likely to compressed, and for just
+ * listing them we don't need to decompress them, so let's
+ * pick a fairly low data threshold here */
+ sd_journal_set_data_threshold(j, 4096);
+
SD_JOURNAL_FOREACH(j) {
if (field)
print_field(stdout, j);
SD_JOURNAL_FOREACH(j) {
if (field)
print_field(stdout, j);
@@
-381,6
+385,9
@@
static int dump_core(sd_journal* j) {
assert(j);
assert(j);
+ /* We want full data, nothing truncated. */
+ sd_journal_set_data_threshold(j, 0);
+
r = focus(j);
if (r < 0)
return r;
r = focus(j);
if (r < 0)
return r;
@@
-428,6
+435,8
@@
static int run_gdb(sd_journal *j) {
assert(j);
assert(j);
+ sd_journal_set_data_threshold(j, 0);
+
r = focus(j);
if (r < 0)
return r;
r = focus(j);
if (r < 0)
return r;
@@
-510,10
+519,11
@@
finish:
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
-
sd_journal
*j = NULL;
+
_cleanup_journal_close_ sd_journal
*j = NULL;
const char* match;
Iterator it;
int r = 0;
const char* match;
Iterator it;
int r = 0;
+ _cleanup_set_free_free_ Set *matches = NULL;
setlocale(LC_ALL, "");
log_parse_environment();
setlocale(LC_ALL, "");
log_parse_environment();
@@
-525,7
+535,7
@@
int main(int argc, char *argv[]) {
goto end;
}
goto end;
}
- r = parse_argv(argc, argv);
+ r = parse_argv(argc, argv
, matches
);
if (r < 0)
goto end;
if (r < 0)
goto end;
@@
-547,11
+557,18
@@
int main(int argc, char *argv[]) {
}
}
}
}
+ if (_unlikely_(log_get_max_level() >= LOG_PRI(LOG_DEBUG))) {
+ _cleanup_free_ char *filter;
+
+ filter = journal_make_match_string(j);
+ log_debug("Journal filter: %s", filter);
+ }
+
switch(arg_action) {
case ACTION_LIST:
if (!arg_no_pager)
switch(arg_action) {
case ACTION_LIST:
if (!arg_no_pager)
- pager_open();
+ pager_open(
false
);
r = dump_list(j);
break;
r = dump_list(j);
break;
@@
-569,11
+586,6
@@
int main(int argc, char *argv[]) {
}
end:
}
end:
- if (j)
- sd_journal_close(j);
-
- set_free_free(matches);
-
pager_close();
if (output)
pager_close();
if (output)