mirror of
https://github.com/systemd/systemd.git
synced 2025-03-31 14:50:15 +03:00
Merge pull request #2536 from vcaputo/journal-misc-cleanups
journal: miscellaneous cleanups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
commit
4121e255f2
@ -100,7 +100,7 @@ static int journal_file_set_online(JournalFile *f) {
|
||||
if (mmap_cache_got_sigbus(f->mmap, f->fd))
|
||||
return -EIO;
|
||||
|
||||
switch(f->header->state) {
|
||||
switch (f->header->state) {
|
||||
case STATE_ONLINE:
|
||||
return 0;
|
||||
|
||||
@ -247,6 +247,7 @@ static int journal_file_refresh_header(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
r = sd_id128_get_machine(&f->header->machine_id);
|
||||
if (r < 0)
|
||||
@ -273,6 +274,7 @@ static int journal_file_verify_header(JournalFile *f) {
|
||||
uint32_t flags;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
if (memcmp(f->header->signature, HEADER_SIGNATURE, 8))
|
||||
return -EBADMSG;
|
||||
@ -381,6 +383,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
/* We assume that this file is not sparse, and we know that
|
||||
* for sure, since we always call posix_fallocate()
|
||||
@ -544,6 +547,7 @@ static uint64_t journal_file_entry_seqnum(JournalFile *f, uint64_t *seqnum) {
|
||||
uint64_t r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
r = le64toh(f->header->tail_entry_seqnum) + 1;
|
||||
|
||||
@ -573,6 +577,7 @@ int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, O
|
||||
void *t;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX);
|
||||
assert(size >= sizeof(ObjectHeader));
|
||||
assert(offset);
|
||||
@ -622,6 +627,7 @@ static int journal_file_setup_data_hash_table(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
/* We estimate that we need 1 hash table entry per 768 bytes
|
||||
of journal file and we want to make sure we never get
|
||||
@ -655,6 +661,7 @@ static int journal_file_setup_field_hash_table(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
/* We use a fixed size hash table for the fields as this
|
||||
* number should grow very slowly only */
|
||||
@ -681,6 +688,7 @@ int journal_file_map_data_hash_table(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
if (f->data_hash_table)
|
||||
return 0;
|
||||
@ -706,6 +714,7 @@ int journal_file_map_field_hash_table(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
if (f->field_hash_table)
|
||||
return 0;
|
||||
@ -735,6 +744,8 @@ static int journal_file_link_field(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(f->field_hash_table);
|
||||
assert(o);
|
||||
assert(offset > 0);
|
||||
|
||||
@ -778,6 +789,8 @@ static int journal_file_link_data(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(f->data_hash_table);
|
||||
assert(o);
|
||||
assert(offset > 0);
|
||||
|
||||
@ -826,6 +839,7 @@ int journal_file_find_field_object_with_hash(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(field && size > 0);
|
||||
|
||||
/* If the field hash table is empty, we can't find anything */
|
||||
@ -897,6 +911,7 @@ int journal_file_find_data_object_with_hash(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(data || size == 0);
|
||||
|
||||
/* If there's no data hash table, then there's no entry. */
|
||||
@ -1193,6 +1208,7 @@ static int link_entry_into_array(JournalFile *f,
|
||||
Object *o;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(first);
|
||||
assert(idx);
|
||||
assert(p > 0);
|
||||
@ -1313,6 +1329,7 @@ static int journal_file_link_entry(JournalFile *f, Object *o, uint64_t offset) {
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(o);
|
||||
assert(offset > 0);
|
||||
|
||||
@ -1363,6 +1380,7 @@ static int journal_file_append_entry_internal(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(items || n_items == 0);
|
||||
assert(ts);
|
||||
|
||||
@ -1507,6 +1525,7 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
|
||||
struct dual_timestamp _ts;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(iovec || n_iovec == 0);
|
||||
|
||||
if (!ts) {
|
||||
@ -2022,6 +2041,8 @@ int journal_file_move_to_entry_by_seqnum(
|
||||
direction_t direction,
|
||||
Object **ret,
|
||||
uint64_t *offset) {
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
return generic_array_bisect(f,
|
||||
le64toh(f->header->entry_array_offset),
|
||||
@ -2057,6 +2078,8 @@ int journal_file_move_to_entry_by_realtime(
|
||||
direction_t direction,
|
||||
Object **ret,
|
||||
uint64_t *offset) {
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
return generic_array_bisect(f,
|
||||
le64toh(f->header->entry_array_offset),
|
||||
@ -2149,7 +2172,9 @@ void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset) {
|
||||
|
||||
int journal_file_compare_locations(JournalFile *af, JournalFile *bf) {
|
||||
assert(af);
|
||||
assert(af->header);
|
||||
assert(bf);
|
||||
assert(bf->header);
|
||||
assert(af->location_type == LOCATION_SEEK);
|
||||
assert(bf->location_type == LOCATION_SEEK);
|
||||
|
||||
@ -2209,6 +2234,7 @@ int journal_file_next_entry(
|
||||
int r;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
n = le64toh(f->header->n_entries);
|
||||
if (n <= 0)
|
||||
@ -2491,6 +2517,7 @@ void journal_file_dump(JournalFile *f) {
|
||||
uint64_t p;
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
journal_file_print_header(f);
|
||||
|
||||
@ -2575,6 +2602,7 @@ void journal_file_print_header(JournalFile *f) {
|
||||
char bytes[FORMAT_BYTES_MAX];
|
||||
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
printf("File Path: %s\n"
|
||||
"File ID: %s\n"
|
||||
@ -3180,6 +3208,7 @@ void journal_default_metrics(JournalMetrics *m, int fd) {
|
||||
|
||||
int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t *to) {
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
assert(from || to);
|
||||
|
||||
if (from) {
|
||||
@ -3243,6 +3272,7 @@ int journal_file_get_cutoff_monotonic_usec(JournalFile *f, sd_id128_t boot_id, u
|
||||
|
||||
bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec) {
|
||||
assert(f);
|
||||
assert(f->header);
|
||||
|
||||
/* If we gained new header fields we gained new features,
|
||||
* hence suggest a rotation */
|
||||
|
||||
@ -244,7 +244,6 @@ static int open_journal(
|
||||
int flags,
|
||||
bool seal,
|
||||
JournalMetrics *metrics,
|
||||
JournalFile *template,
|
||||
JournalFile **ret) {
|
||||
int r;
|
||||
JournalFile *f;
|
||||
@ -254,9 +253,9 @@ static int open_journal(
|
||||
assert(ret);
|
||||
|
||||
if (reliably)
|
||||
r = journal_file_open_reliably(fname, flags, 0640, s->compress, seal, metrics, s->mmap, template, &f);
|
||||
r = journal_file_open_reliably(fname, flags, 0640, s->compress, seal, metrics, s->mmap, NULL, &f);
|
||||
else
|
||||
r = journal_file_open(fname, flags, 0640, s->compress, seal, metrics, s->mmap, template, &f);
|
||||
r = journal_file_open(fname, flags, 0640, s->compress, seal, metrics, s->mmap, NULL, &f);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -308,7 +307,7 @@ static JournalFile* find_journal(Server *s, uid_t uid) {
|
||||
journal_file_close(f);
|
||||
}
|
||||
|
||||
r = open_journal(s, true, p, O_RDWR|O_CREAT, s->seal, &s->system_metrics, NULL, &f);
|
||||
r = open_journal(s, true, p, O_RDWR|O_CREAT, s->seal, &s->system_metrics, &f);
|
||||
if (r < 0)
|
||||
return s->system_journal;
|
||||
|
||||
@ -1000,7 +999,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
|
||||
(void) mkdir(fn, 0755);
|
||||
|
||||
fn = strjoina(fn, "/system.journal");
|
||||
r = open_journal(s, true, fn, O_RDWR|O_CREAT, s->seal, &s->system_metrics, NULL, &s->system_journal);
|
||||
r = open_journal(s, true, fn, O_RDWR|O_CREAT, s->seal, &s->system_metrics, &s->system_journal);
|
||||
if (r >= 0) {
|
||||
server_add_acls(s->system_journal, 0);
|
||||
(void) determine_space_for(s, &s->system_metrics, "/var/log/journal/", "System journal", true, true, NULL, NULL);
|
||||
@ -1023,7 +1022,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
|
||||
* if it already exists, so that we can flush
|
||||
* it into the system journal */
|
||||
|
||||
r = open_journal(s, false, fn, O_RDWR, false, &s->runtime_metrics, NULL, &s->runtime_journal);
|
||||
r = open_journal(s, false, fn, O_RDWR, false, &s->runtime_metrics, &s->runtime_journal);
|
||||
if (r < 0) {
|
||||
if (r != -ENOENT)
|
||||
log_warning_errno(r, "Failed to open runtime journal: %m");
|
||||
@ -1040,7 +1039,7 @@ static int system_journal_open(Server *s, bool flush_requested) {
|
||||
(void) mkdir("/run/log/journal", 0755);
|
||||
(void) mkdir_parents(fn, 0750);
|
||||
|
||||
r = open_journal(s, true, fn, O_RDWR|O_CREAT, false, &s->runtime_metrics, NULL, &s->runtime_journal);
|
||||
r = open_journal(s, true, fn, O_RDWR|O_CREAT, false, &s->runtime_metrics, &s->runtime_journal);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to open runtime journal: %m");
|
||||
}
|
||||
|
||||
@ -173,10 +173,11 @@ _pure_ static bool window_matches(Window *w, int fd, int prot, uint64_t offset,
|
||||
offset + size <= w->offset + w->size;
|
||||
}
|
||||
|
||||
static Window *window_add(MMapCache *m) {
|
||||
static Window *window_add(MMapCache *m, FileDescriptor *fd, int prot, bool keep_always, uint64_t offset, size_t size, void *ptr) {
|
||||
Window *w;
|
||||
|
||||
assert(m);
|
||||
assert(fd);
|
||||
|
||||
if (!m->last_unused || m->n_windows <= WINDOWS_MIN) {
|
||||
|
||||
@ -194,6 +195,15 @@ static Window *window_add(MMapCache *m) {
|
||||
}
|
||||
|
||||
w->cache = m;
|
||||
w->fd = fd;
|
||||
w->prot = prot;
|
||||
w->keep_always = keep_always;
|
||||
w->offset = offset;
|
||||
w->size = size;
|
||||
w->ptr = ptr;
|
||||
|
||||
LIST_PREPEND(by_fd, fd->windows, w);
|
||||
|
||||
return w;
|
||||
}
|
||||
|
||||
@ -459,6 +469,33 @@ static int find_mmap(
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int mmap_try_harder(MMapCache *m, void *addr, int fd, int prot, int flags, uint64_t offset, size_t size, void **res) {
|
||||
void *ptr;
|
||||
|
||||
assert(m);
|
||||
assert(fd >= 0);
|
||||
assert(res);
|
||||
|
||||
for (;;) {
|
||||
int r;
|
||||
|
||||
ptr = mmap(addr, size, prot, flags, fd, offset);
|
||||
if (ptr != MAP_FAILED)
|
||||
break;
|
||||
if (errno != ENOMEM)
|
||||
return -errno;
|
||||
|
||||
r = make_room(m);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
*res = ptr;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int add_mmap(
|
||||
MMapCache *m,
|
||||
int fd,
|
||||
@ -512,19 +549,9 @@ static int add_mmap(
|
||||
wsize = PAGE_ALIGN(st->st_size - woffset);
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
d = mmap(NULL, wsize, prot, MAP_SHARED, fd, woffset);
|
||||
if (d != MAP_FAILED)
|
||||
break;
|
||||
if (errno != ENOMEM)
|
||||
return -errno;
|
||||
|
||||
r = make_room(m);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r == 0)
|
||||
return -ENOMEM;
|
||||
}
|
||||
r = mmap_try_harder(m, NULL, fd, prot, MAP_SHARED, woffset, wsize, &d);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
c = context_add(m, context);
|
||||
if (!c)
|
||||
@ -534,19 +561,10 @@ static int add_mmap(
|
||||
if (!f)
|
||||
goto outofmem;
|
||||
|
||||
w = window_add(m);
|
||||
w = window_add(m, f, prot, keep_always, woffset, wsize, d);
|
||||
if (!w)
|
||||
goto outofmem;
|
||||
|
||||
w->keep_always = keep_always;
|
||||
w->ptr = d;
|
||||
w->offset = woffset;
|
||||
w->prot = prot;
|
||||
w->size = wsize;
|
||||
w->fd = f;
|
||||
|
||||
LIST_PREPEND(by_fd, f->windows, w);
|
||||
|
||||
context_detach_window(c);
|
||||
c->window = w;
|
||||
LIST_PREPEND(by_window, w->contexts, c);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user