X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.c;h=74abac88af74ad262d4649518fea1e8109ca570d;hp=f1dd92927c10cb087428b584ad2c696deccbc571;hb=7210bfb3706f8cbb2b35403f916dace1824c516c;hpb=87d2c1ff6a7375f03476767e6f59454bcc5cd04b
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index f1dd92927..74abac88a 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -19,1315 +19,634 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
-#include
-#include
#include
#include
#include "sd-journal.h"
#include "journal-def.h"
-#include "journal-private.h"
-#include "lookup3.h"
+#include "journal-file.h"
+#include "hashmap.h"
#include "list.h"
-#define DEFAULT_ARENA_MAX_SIZE (16ULL*1024ULL*1024ULL*1024ULL)
-#define DEFAULT_ARENA_MIN_SIZE (256ULL*1024ULL)
-#define DEFAULT_ARENA_KEEP_FREE (1ULL*1024ULL*1024ULL)
+typedef struct Match Match;
-#define DEFAULT_HASH_TABLE_SIZE (2047ULL*16ULL)
-#define DEFAULT_BISECT_TABLE_SIZE ((DEFAULT_ARENA_MAX_SIZE/(64ULL*1024ULL))*8ULL)
+struct Match {
+ char *data;
+ size_t size;
+ uint64_t hash;
-#define DEFAULT_WINDOW_SIZE (128ULL*1024ULL*1024ULL)
+ LIST_FIELDS(Match, matches);
+};
-struct JournalFile {
- sd_journal *journal;
+struct sd_journal {
+ Hashmap *files;
- int fd;
- char *path;
- struct stat last_stat;
- int prot;
- bool writable;
+ JournalFile *current_file;
+ uint64_t current_field;
- Header *header;
+ LIST_HEAD(Match, matches);
+};
- HashItem *hash_table;
- void *hash_table_window;
- uint64_t hash_table_window_size;
+int sd_journal_add_match(sd_journal *j, const char *field, const void *data, size_t size) {
+ Match *m;
+ char *e;
- uint64_t *bisect_table;
- void *bisect_table_window;
- uint64_t bisect_table_window_size;
+ assert(j);
+ assert(field);
+ assert(data || size == 0);
- void *window;
- uint64_t window_offset;
- uint64_t window_size;
+ m = new0(Match, 1);
+ if (!m)
+ return -ENOMEM;
- Object *current;
- uint64_t current_offset;
+ m->size = strlen(field) + 1 + size;
+ m->data = malloc(m->size);
+ if (!m->data) {
+ free(m);
+ return -ENOMEM;
+ }
- LIST_FIELDS(JournalFile, files);
-};
+ e = stpcpy(m->data, field);
+ *(e++) = '=';
+ memcpy(e, data, size);
-struct sd_journal {
- LIST_HEAD(JournalFile, files);
-};
+ LIST_PREPEND(Match, matches, j->matches, m);
+ return 0;
+}
-static const char signature[] = { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' };
+void sd_journal_flush_matches(sd_journal *j) {
+ assert(j);
-#define ALIGN64(x) (((x) + 7ULL) & ~7ULL)
+ while (j->matches) {
+ Match *m = j->matches;
-void journal_file_close(JournalFile *f) {
- assert(f);
+ LIST_REMOVE(Match, matches, j->matches, m);
+ free(m->data);
+ free(m);
+ }
+}
- if (f->journal)
- LIST_REMOVE(JournalFile, files, f->journal->files, f);
+static int compare_order(JournalFile *af, Object *ao, uint64_t ap,
+ JournalFile *bf, Object *bo, uint64_t bp) {
- if (f->fd >= 0)
- close_nointr_nofail(f->fd);
+ uint64_t a, b;
- if (f->header)
- munmap(f->header, PAGE_ALIGN(sizeof(Header)));
+ /* We operate on two different files here, hence we can access
+ * two objects at the same time, which we normally can't */
- if (f->hash_table_window)
- munmap(f->hash_table_window, f->hash_table_window_size);
+ if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {
- if (f->bisect_table_window)
- munmap(f->bisect_table_window, f->bisect_table_window_size);
+ /* If this is from the same seqnum source, compare
+ * seqnums */
+ a = le64toh(ao->entry.seqnum);
+ b = le64toh(bo->entry.seqnum);
- if (f->window)
- munmap(f->window, f->window_size);
+ if (a < b)
+ return -1;
+ if (a > b)
+ return 1;
+ }
- free(f->path);
- free(f);
-}
+ if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
-static int journal_file_init_header(JournalFile *f) {
- Header h;
- ssize_t k;
- int r;
+ /* If the boot id matches compare monotonic time */
+ a = le64toh(ao->entry.monotonic);
+ b = le64toh(bo->entry.monotonic);
- assert(f);
+ if (a < b)
+ return -1;
+ if (a > b)
+ return 1;
+ }
- zero(h);
- memcpy(h.signature, signature, 8);
- h.arena_offset = htole64(ALIGN64(sizeof(h)));
- h.arena_max_size = htole64(DEFAULT_ARENA_MAX_SIZE);
- h.arena_min_size = htole64(DEFAULT_ARENA_MIN_SIZE);
- h.arena_keep_free = htole64(DEFAULT_ARENA_KEEP_FREE);
+ /* Otherwise compare UTC time */
+ a = le64toh(ao->entry.realtime);
+ b = le64toh(ao->entry.realtime);
- r = sd_id128_randomize(&h.file_id);
- if (r < 0)
- return r;
+ if (a < b)
+ return -1;
+ if (a > b)
+ return 1;
- k = pwrite(f->fd, &h, sizeof(h), 0);
- if (k < 0)
- return -errno;
+ /* Finally, compare by contents */
+ a = le64toh(ao->entry.xor_hash);
+ b = le64toh(ao->entry.xor_hash);
- if (k != sizeof(h))
- return -EIO;
+ if (a < b)
+ return -1;
+ if (a > b)
+ return 1;
return 0;
}
-static int journal_file_refresh_header(JournalFile *f) {
+int sd_journal_next(sd_journal *j) {
+ JournalFile *f, *new_current = NULL;
+ Iterator i;
int r;
+ uint64_t new_offset = 0;
+ Object *new_entry = NULL;
- assert(f);
+ assert(j);
- r = sd_id128_get_machine(&f->header->machine_id);
- if (r < 0)
- return r;
+ HASHMAP_FOREACH(f, j->files, i) {
+ Object *o;
+ uint64_t p;
- r = sd_id128_get_boot(&f->header->boot_id);
- if (r < 0)
- return r;
+ if (f->current_offset > 0) {
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
+ } else
+ o = NULL;
- f->header->state = htole32(STATE_ONLINE);
- return 0;
-}
+ r = journal_file_next_entry(f, o, &o, &p);
+ if (r < 0)
+ return r;
+ else if (r == 0)
+ continue;
-static int journal_file_verify_header(JournalFile *f) {
- assert(f);
+ if (!new_current ||
+ compare_order(new_current, new_entry, new_offset, f, o, p) > 0) {
+ new_current = f;
+ new_entry = o;
+ new_offset = p;
+ }
+ }
- if (memcmp(f->header, signature, 8))
- return -EBADMSG;
+ if (new_current) {
+ j->current_file = new_current;
+ j->current_file->current_offset = new_offset;
+ j->current_field = 0;
- if (f->header->incompatible_flags != 0)
- return -EPROTONOSUPPORT;
+ /* Skip over any identical entries in the other files too */
- if ((uint64_t) f->last_stat.st_size < (le64toh(f->header->arena_offset) + le64toh(f->header->arena_size)))
- return -ENODATA;
+ HASHMAP_FOREACH(f, j->files, i) {
+ Object *o;
+ uint64_t p;
- if (f->writable) {
- uint32_t state;
- sd_id128_t machine_id;
- int r;
+ if (j->current_file == f)
+ continue;
- r = sd_id128_get_machine(&machine_id);
- if (r < 0)
- return r;
+ if (f->current_offset > 0) {
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
+ } else
+ o = NULL;
- if (!sd_id128_equal(machine_id, f->header->machine_id))
- return -EHOSTDOWN;
+ r = journal_file_next_entry(f, o, &o, &p);
+ if (r < 0)
+ return r;
+ else if (r == 0)
+ continue;
- state = le32toh(f->header->state);
+ if (compare_order(new_current, new_entry, new_offset, f, o, p) == 0)
+ f->current_offset = p;
+ }
- if (state == STATE_ONLINE)
- log_debug("Journal file %s is already online. Assuming unclean closing. Ignoring.", f->path);
- else if (state == STATE_ARCHIVED)
- return -ESHUTDOWN;
- else if (state != STATE_OFFLINE)
- log_debug("Journal file %s has unknown state %u. Ignoring.", f->path, state);
+ return 1;
}
return 0;
}
-static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
- uint64_t asize;
- uint64_t old_size, new_size;
+int sd_journal_previous(sd_journal *j) {
+ JournalFile *f, *new_current = NULL;
+ Iterator i;
+ int r;
+ uint64_t new_offset = 0;
+ Object *new_entry = NULL;
- assert(f);
+ assert(j);
- if (offset < le64toh(f->header->arena_offset))
- return -EINVAL;
+ HASHMAP_FOREACH(f, j->files, i) {
+ Object *o;
+ uint64_t p;
- new_size = PAGE_ALIGN(offset + size);
+ if (f->current_offset > 0) {
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
+ } else
+ o = NULL;
- /* We assume that this file is not sparse, and we know that
- * for sure, since we alway call posix_fallocate()
- * ourselves */
+ r = journal_file_prev_entry(f, o, &o, &p);
+ if (r < 0)
+ return r;
+ else if (r == 0)
+ continue;
- old_size =
- le64toh(f->header->arena_offset) +
- le64toh(f->header->arena_size);
+ if (!new_current || compare_order(new_current, new_entry, new_offset, f, o, p) > 0) {
+ new_current = f;
+ new_entry = o;
+ new_offset = p;
+ }
+ }
- if (old_size >= new_size)
- return 0;
+ if (new_current) {
+ j->current_file = new_current;
+ j->current_file->current_offset = new_offset;
+ j->current_field = 0;
- asize = new_size - le64toh(f->header->arena_offset);
+ /* Skip over any identical entries in the other files too */
- if (asize > le64toh(f->header->arena_min_size)) {
- struct statvfs svfs;
+ HASHMAP_FOREACH(f, j->files, i) {
+ Object *o;
+ uint64_t p;
- if (fstatvfs(f->fd, &svfs) >= 0) {
- uint64_t available;
+ if (j->current_file == f)
+ continue;
- available = svfs.f_bfree * svfs.f_bsize;
+ if (f->current_offset > 0) {
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
+ } else
+ o = NULL;
- if (available >= f->header->arena_keep_free)
- available -= f->header->arena_keep_free;
- else
- available = 0;
+ r = journal_file_prev_entry(f, o, &o, &p);
+ if (r < 0)
+ return r;
+ else if (r == 0)
+ continue;
- if (new_size - old_size > available)
- return -E2BIG;
+ if (compare_order(new_current, new_entry, new_offset, f, o, p) == 0)
+ f->current_offset = p;
}
- }
-
- if (asize > le64toh(f->header->arena_max_size))
- return -E2BIG;
-
- if (posix_fallocate(f->fd, 0, new_size) < 0)
- return -errno;
-
- if (fstat(f->fd, &f->last_stat) < 0)
- return -errno;
- f->header->arena_size = htole64(asize);
+ return 1;
+ }
return 0;
}
-static int journal_file_map(
- JournalFile *f,
- uint64_t offset,
- uint64_t size,
- void **_window,
- uint64_t *_woffset,
- uint64_t *_wsize,
- void **ret) {
-
- uint64_t woffset, wsize;
- void *window;
-
- assert(f);
- assert(size > 0);
- assert(ret);
+int sd_journal_get_cursor(sd_journal *j, char **cursor) {
+ Object *o;
+ int r;
+ char bid[33], sid[33];
- woffset = offset & ~((uint64_t) page_size() - 1ULL);
- wsize = size + (offset - woffset);
- wsize = PAGE_ALIGN(wsize);
+ assert(j);
+ assert(cursor);
- window = mmap(NULL, wsize, f->prot, MAP_SHARED, f->fd, woffset);
- if (window == MAP_FAILED)
- return -errno;
+ if (!j->current_file || j->current_file->current_offset <= 0)
+ return -EADDRNOTAVAIL;
- if (_window)
- *_window = window;
+ r = journal_file_move_to_object(j->current_file, j->current_file->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
- if (_woffset)
- *_woffset = woffset;
+ sd_id128_to_string(j->current_file->header->seqnum_id, sid);
+ sd_id128_to_string(o->entry.boot_id, bid);
- if (_wsize)
- *_wsize = wsize;
+ if (asprintf(cursor,
+ "s=%s;i=%llx;b=%s;m=%llx;t=%llx;x=%llx;p=%s",
+ sid, (unsigned long long) le64toh(o->entry.seqnum),
+ bid, (unsigned long long) le64toh(o->entry.monotonic),
+ (unsigned long long) le64toh(o->entry.realtime),
+ (unsigned long long) le64toh(o->entry.xor_hash),
+ file_name_from_path(j->current_file->path)) < 0)
+ return -ENOMEM;
- *ret = (uint8_t*) window + (offset - woffset);
+ return 1;
+}
- return 0;
+int sd_journal_set_cursor(sd_journal *j, const char *cursor) {
+ return -EINVAL;
}
-static int journal_file_move_to(JournalFile *f, uint64_t offset, uint64_t size, void **ret) {
- void *p;
- uint64_t delta;
+static int add_file(sd_journal *j, const char *prefix, const char *dir, const char *filename) {
+ char *fn;
int r;
+ JournalFile *f;
- assert(f);
- assert(ret);
-
- if (_likely_(f->window &&
- f->window_offset <= offset &&
- f->window_offset+f->window_size >= offset + size)) {
-
- *ret = (uint8_t*) f->window + (offset - f->window_offset);
- return 0;
- }
-
- if (f->window) {
- if (munmap(f->window, f->window_size) < 0)
- return -errno;
-
- f->window = NULL;
- f->window_size = f->window_offset = 0;
- }
+ assert(j);
+ assert(prefix);
+ assert(filename);
- if (size < DEFAULT_WINDOW_SIZE) {
- /* If the default window size is larger then what was
- * asked for extend the mapping a bit in the hope to
- * minimize needed remappings later on. We add half
- * the window space before and half behind the
- * requested mapping */
+ if (dir)
+ fn = join(prefix, "/", dir, "/", filename, NULL);
+ else
+ fn = join(prefix, "/", filename, NULL);
- delta = PAGE_ALIGN((DEFAULT_WINDOW_SIZE - size) / 2);
+ if (!fn)
+ return -ENOMEM;
- if (offset < delta)
- delta = offset;
+ r = journal_file_open(fn, O_RDONLY, 0, NULL, &f);
+ free(fn);
- offset -= delta;
- size += (DEFAULT_WINDOW_SIZE - delta);
- } else
- delta = 0;
+ if (r < 0) {
+ if (errno == ENOENT)
+ return 0;
- r = journal_file_map(f,
- offset, size,
- &f->window, &f->window_offset, &f->window_size,
- & p);
+ return r;
+ }
- if (r < 0)
+ r = hashmap_put(j->files, f->path, f);
+ if (r < 0) {
+ journal_file_close(f);
return r;
+ }
- *ret = (uint8_t*) p + delta;
return 0;
}
-static bool verify_hash(Object *o) {
- uint64_t t;
+static int add_directory(sd_journal *j, const char *prefix, const char *dir) {
+ char *fn;
+ int r;
+ DIR *d;
- assert(o);
+ assert(j);
+ assert(prefix);
+ assert(dir);
- t = le64toh(o->object.type);
- if (t == OBJECT_DATA) {
- uint64_t s, h1, h2;
+ fn = join(prefix, "/", dir, NULL);
+ if (!fn)
+ return -ENOMEM;
- s = le64toh(o->object.size);
+ d = opendir(fn);
+ free(fn);
- h1 = le64toh(o->data.hash);
- h2 = hash64(o->data.payload, s - offsetof(Object, data.payload));
+ if (!d) {
+ if (errno == ENOENT)
+ return 0;
- return h1 == h2;
+ return -errno;
}
- return true;
-}
-
-int journal_file_move_to_object(JournalFile *f, uint64_t offset, Object **ret) {
- int r;
- void *t;
- Object *o;
- uint64_t s;
-
- assert(f);
- assert(ret);
-
- r = journal_file_move_to(f, offset, sizeof(ObjectHeader), &t);
- if (r < 0)
- return r;
+ for (;;) {
+ struct dirent buf, *de;
- o = (Object*) t;
- s = le64toh(o->object.size);
+ r = readdir_r(d, &buf, &de);
+ if (r != 0 || !de)
+ break;
- if (s < sizeof(ObjectHeader))
- return -EBADMSG;
+ if (!dirent_is_file_with_suffix(de, ".journal"))
+ continue;
- if (s > sizeof(ObjectHeader)) {
- r = journal_file_move_to(f, offset, s, &t);
+ r = add_file(j, prefix, dir, de->d_name);
if (r < 0)
- return r;
-
- o = (Object*) t;
+ log_debug("Failed to add file %s/%s/%s: %s", prefix, dir, de->d_name, strerror(-r));
}
- if (!verify_hash(o))
- return -EBADMSG;
+ closedir(d);
- *ret = o;
return 0;
}
-static uint64_t journal_file_seqnum(JournalFile *f) {
- uint64_t r;
-
- assert(f);
-
- r = le64toh(f->header->seqnum) + 1;
- f->header->seqnum = htole64(r);
-
- return r;
-}
-
-static int journal_file_append_object(JournalFile *f, uint64_t size, Object **ret, uint64_t *offset) {
+int sd_journal_open(sd_journal **ret) {
+ sd_journal *j;
+ const char *p;
+ const char search_paths[] =
+ "/run/log/journal\0"
+ "/var/log/journal\0";
int r;
- uint64_t p;
- Object *tail, *o;
- void *t;
- assert(f);
- assert(size >= sizeof(ObjectHeader));
- assert(offset);
assert(ret);
- p = le64toh(f->header->tail_object_offset);
-
- if (p == 0)
- p = le64toh(f->header->arena_offset);
- else {
- r = journal_file_move_to_object(f, p, &tail);
- if (r < 0)
- return r;
+ j = new0(sd_journal, 1);
+ if (!j)
+ return -ENOMEM;
- p += ALIGN64(le64toh(tail->object.size));
+ j->files = hashmap_new(string_hash_func, string_compare_func);
+ if (!j->files) {
+ r = -ENOMEM;
+ goto fail;
}
- r = journal_file_allocate(f, p, size);
- if (r < 0)
- return r;
-
- r = journal_file_move_to(f, p, size, &t);
- if (r < 0)
- return r;
-
- o = (Object*) t;
-
- zero(o->object);
- o->object.type = htole64(OBJECT_UNUSED);
- zero(o->object.reserved);
- o->object.size = htole64(size);
+ /* We ignore most errors here, since the idea is to only open
+ * what's actually accessible, and ignore the rest. */
- f->header->tail_object_offset = htole64(p);
- if (f->header->head_object_offset == 0)
- f->header->head_object_offset = htole64(p);
-
- f->header->n_objects = htole64(le64toh(f->header->n_objects) + 1);
+ NULSTR_FOREACH(p, search_paths) {
+ DIR *d;
- *ret = o;
- *offset = p;
+ d = opendir(p);
+ if (!d) {
+ if (errno != ENOENT)
+ log_debug("Failed to open %s: %m", p);
+ continue;
+ }
- return 0;
-}
+ for (;;) {
+ struct dirent buf, *de;
+ sd_id128_t id;
-static int journal_file_setup_hash_table(JournalFile *f) {
- uint64_t s, p;
- Object *o;
- int r;
+ r = readdir_r(d, &buf, &de);
+ if (r != 0 || !de)
+ break;
- assert(f);
+ if (dirent_is_file_with_suffix(de, ".journal")) {
+ r = add_file(j, p, NULL, de->d_name);
+ if (r < 0)
+ log_debug("Failed to add file %s/%s: %s", p, de->d_name, strerror(-r));
- s = DEFAULT_HASH_TABLE_SIZE;
- r = journal_file_append_object(f, offsetof(Object, hash_table.table) + s, &o, &p);
- if (r < 0)
- return r;
+ } else if ((de->d_type == DT_DIR || de->d_type == DT_UNKNOWN) &&
+ sd_id128_from_string(de->d_name, &id) >= 0) {
- o->object.type = htole64(OBJECT_HASH_TABLE);
- memset(o->hash_table.table, 0, s);
+ r = add_directory(j, p, de->d_name);
+ if (r < 0)
+ log_debug("Failed to add directory %s/%s: %s", p, de->d_name, strerror(-r));
+ }
+ }
- f->header->hash_table_offset = htole64(p + offsetof(Object, hash_table.table));
- f->header->hash_table_size = htole64(s);
+ closedir(d);
+ }
+ *ret = j;
return 0;
-}
-static int journal_file_setup_bisect_table(JournalFile *f) {
- uint64_t s, p;
- Object *o;
- int r;
+fail:
+ sd_journal_close(j);
- assert(f);
+ return r;
+};
- s = DEFAULT_BISECT_TABLE_SIZE;
- r = journal_file_append_object(f, offsetof(Object, bisect_table.table) + s, &o, &p);
- if (r < 0)
- return r;
+void sd_journal_close(sd_journal *j) {
+ assert(j);
- o->object.type = htole64(OBJECT_BISECT_TABLE);
- memset(o->bisect_table.table, 0, s);
+ if (j->files) {
+ JournalFile *f;
- f->header->bisect_table_offset = htole64(p + offsetof(Object, bisect_table.table));
- f->header->bisect_table_size = htole64(s);
+ while ((f = hashmap_steal_first(j->files)))
+ journal_file_close(f);
- return 0;
+ hashmap_free(j->files);
+ }
+
+ free(j);
}
-static int journal_file_map_hash_table(JournalFile *f) {
- uint64_t s, p;
- void *t;
+int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
+ Object *o;
+ JournalFile *f;
int r;
- assert(f);
+ assert(j);
+ assert(ret);
+
+ f = j->current_file;
+ if (!f)
+ return 0;
- p = le64toh(f->header->hash_table_offset);
- s = le64toh(f->header->hash_table_size);
+ if (f->current_offset <= 0)
+ return 0;
- r = journal_file_map(f,
- p, s,
- &f->hash_table_window, NULL, &f->hash_table_window_size,
- &t);
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
if (r < 0)
return r;
- f->hash_table = t;
- return 0;
+ *ret = le64toh(o->entry.realtime);
+ return 1;
}
-static int journal_file_map_bisect_table(JournalFile *f) {
- uint64_t s, p;
- void *t;
+int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret) {
+ Object *o;
+ JournalFile *f;
int r;
+ sd_id128_t id;
+
+ assert(j);
+ assert(ret);
- assert(f);
+ f = j->current_file;
+ if (!f)
+ return 0;
- p = le64toh(f->header->bisect_table_offset);
- s = le64toh(f->header->bisect_table_size);
+ if (f->current_offset <= 0)
+ return 0;
- r = journal_file_map(f,
- p, s,
- &f->bisect_table_window, NULL, &f->bisect_table_window_size,
- &t);
+ r = sd_id128_get_machine(&id);
+ if (r < 0)
+ return r;
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
if (r < 0)
return r;
- f->bisect_table = t;
- return 0;
+ if (!sd_id128_equal(id, o->entry.boot_id))
+ return 0;
+
+ *ret = le64toh(o->entry.monotonic);
+ return 1;
+
}
-static int journal_file_link_data(JournalFile *f, Object *o, uint64_t offset, uint64_t hash_index) {
- uint64_t p;
+int sd_journal_get_field(sd_journal *j, const char *field, const void **data, size_t *size) {
+ JournalFile *f;
+ uint64_t i, n;
+ size_t field_length;
int r;
+ Object *o;
- assert(f);
- assert(o);
- assert(offset > 0);
- assert(o->object.type == htole64(OBJECT_DATA));
+ assert(j);
+ assert(field);
+ assert(data);
+ assert(size);
- o->data.head_entry_offset = o->data.tail_entry_offset = 0;
- o->data.next_hash_offset = 0;
+ if (isempty(field) || strchr(field, '='))
+ return -EINVAL;
- p = le64toh(f->hash_table[hash_index].tail_hash_offset);
- if (p == 0) {
- /* Only entry in the hash table is easy */
+ f = j->current_file;
+ if (!f)
+ return 0;
- o->data.prev_hash_offset = 0;
- f->hash_table[hash_index].head_hash_offset = htole64(offset);
- } else {
- o->data.prev_hash_offset = htole64(p);
+ if (f->current_offset <= 0)
+ return 0;
- /* Temporarily move back to the previous data object,
- * to patch in pointer */
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
+ if (r < 0)
+ return r;
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
+ field_length = strlen(field);
- o->data.next_hash_offset = offset;
+ n = journal_file_entry_n_items(o);
+ for (i = 0; i < n; i++) {
+ uint64_t p, l;
+ size_t t;
- r = journal_file_move_to_object(f, offset, &o);
+ p = le64toh(o->entry.items[i].object_offset);
+ r = journal_file_move_to_object(f, p, OBJECT_DATA, &o);
if (r < 0)
return r;
- }
- f->hash_table[hash_index].tail_hash_offset = htole64(offset);
-
- return 0;
-}
+ l = le64toh(o->object.size) - offsetof(Object, data.payload);
-static int journal_file_append_data(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset) {
- uint64_t hash, h, p, np;
- uint64_t osize;
- Object *o;
- int r;
+ if (l >= field_length+1 &&
+ memcmp(o->data.payload, field, field_length) == 0 &&
+ o->data.payload[field_length] == '=') {
- assert(f);
- assert(data || size == 0);
+ t = (size_t) l;
- osize = offsetof(Object, data.payload) + size;
+ if ((uint64_t) t != l)
+ return -E2BIG;
- hash = hash64(data, size);
- h = hash % (le64toh(f->header->hash_table_size) / sizeof(HashItem));
- p = le64toh(f->hash_table[h].head_hash_offset);
+ *data = o->data.payload;
+ *size = t;
- while (p != 0) {
- /* Look for this data object in the hash table */
+ return 1;
+ }
- r = journal_file_move_to_object(f, p, &o);
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
if (r < 0)
return r;
+ }
- if (le64toh(o->object.type) != OBJECT_DATA)
- return -EBADMSG;
-
- if (le64toh(o->object.size) == osize &&
- memcmp(o->data.payload, data, size) == 0) {
-
- if (le64toh(o->data.hash) != hash)
- return -EBADMSG;
+ return 0;
+}
- if (ret)
- *ret = o;
+int sd_journal_iterate_fields(sd_journal *j, const void **data, size_t *size) {
+ JournalFile *f;
+ uint64_t p, l, n;
+ size_t t;
+ int r;
+ Object *o;
- if (offset)
- *offset = p;
+ assert(j);
+ assert(data);
+ assert(size);
- return 0;
- }
+ f = j->current_file;
+ if (!f)
+ return 0;
- p = le64toh(o->data.next_hash_offset);
- }
+ if (f->current_offset <= 0)
+ return 0;
- r = journal_file_append_object(f, osize, &o, &np);
+ r = journal_file_move_to_object(f, f->current_offset, OBJECT_ENTRY, &o);
if (r < 0)
return r;
- o->object.type = htole64(OBJECT_DATA);
- o->data.hash = htole64(hash);
- memcpy(o->data.payload, data, size);
+ n = journal_file_entry_n_items(o);
+ if (j->current_field >= n)
+ return 0;
- r = journal_file_link_data(f, o, np, h);
+ p = le64toh(o->entry.items[j->current_field].object_offset);
+ r = journal_file_move_to_object(f, p, OBJECT_DATA, &o);
if (r < 0)
return r;
- if (ret)
- *ret = o;
+ l = le64toh(o->object.size) - offsetof(Object, data.payload);
+ t = (size_t) l;
- if (offset)
- *offset = np;
+ /* We can't read objects larger than 4G on a 32bit machine */
+ if ((uint64_t) t != l)
+ return -E2BIG;
- return 0;
-}
+ *data = o->data.payload;
+ *size = t;
-uint64_t journal_file_entry_n_items(Object *o) {
- assert(o);
- assert(o->object.type == htole64(OBJECT_ENTRY));
+ j->current_field ++;
- return (le64toh(o->object.size) - offsetof(Object, entry.items)) / sizeof(EntryItem);
+ return 1;
}
-static int journal_file_link_entry_item(JournalFile *f, Object *o, uint64_t offset, uint64_t i) {
- uint64_t p, q;
- int r;
- assert(f);
- assert(o);
- assert(offset > 0);
-
- p = le64toh(o->entry.items[i].object_offset);
- if (p == 0)
- return -EINVAL;
-
- o->entry.items[i].next_entry_offset = 0;
-
- /* Move to the data object */
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (o->object.type != htole64(OBJECT_DATA))
- return -EBADMSG;
-
- q = le64toh(o->data.tail_entry_offset);
- o->data.tail_entry_offset = htole64(offset);
-
- if (q == 0)
- o->data.head_entry_offset = htole64(offset);
- else {
- uint64_t n, j;
-
- /* Move to previous entry */
- r = journal_file_move_to_object(f, q, &o);
- if (r < 0)
- return r;
-
- if (o->object.type != htole64(OBJECT_ENTRY))
- return -EBADMSG;
-
- n = journal_file_entry_n_items(o);
- for (j = 0; j < n; j++)
- if (le64toh(o->entry.items[j].object_offset) == p)
- break;
-
- if (j >= n)
- return -EBADMSG;
-
- o->entry.items[j].next_entry_offset = offset;
- }
-
- /* Move back to original entry */
- r = journal_file_move_to_object(f, offset, &o);
- if (r < 0)
- return r;
-
- o->entry.items[i].prev_entry_offset = q;
- return 0;
-}
-
-static int journal_file_link_entry(JournalFile *f, Object *o, uint64_t offset) {
- uint64_t p, i, n, k, a, b;
- int r;
-
- assert(f);
- assert(o);
- assert(offset > 0);
- assert(o->object.type == htole64(OBJECT_ENTRY));
-
- /* Link up the entry itself */
- p = le64toh(f->header->tail_entry_offset);
-
- o->entry.prev_entry_offset = f->header->tail_entry_offset;
- o->entry.next_entry_offset = 0;
-
- if (p == 0)
- f->header->head_entry_offset = htole64(offset);
- else {
- /* Temporarily move back to the previous entry, to
- * patch in pointer */
-
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- o->entry.next_entry_offset = htole64(offset);
-
- r = journal_file_move_to_object(f, offset, &o);
- if (r < 0)
- return r;
- }
-
- f->header->tail_entry_offset = htole64(offset);
-
- /* Link up the items */
- n = journal_file_entry_n_items(o);
- for (i = 0; i < n; i++) {
- r = journal_file_link_entry_item(f, o, offset, i);
- if (r < 0)
- return r;
- }
-
- /* Link up the entry in the bisect table */
- n = le64toh(f->header->bisect_table_size) / sizeof(uint64_t);
- k = le64toh(f->header->arena_max_size) / n;
-
- a = (le64toh(f->header->last_bisect_offset) + k - 1) / k;
- b = offset / k;
-
- for (; a <= b; a++)
- f->bisect_table[a] = htole64(offset);
-
- f->header->last_bisect_offset = htole64(offset + le64toh(o->object.size));
-
- return 0;
-}
-
-static int journal_file_append_entry_internal(JournalFile *f, const dual_timestamp *ts, const EntryItem items[], unsigned n_items, Object **ret, uint64_t *offset) {
- uint64_t np;
- uint64_t osize;
- Object *o;
- int r;
-
- assert(f);
- assert(items || n_items == 0);
-
- osize = offsetof(Object, entry.items) + (n_items * sizeof(EntryItem));
-
- r = journal_file_append_object(f, osize, &o, &np);
- if (r < 0)
- return r;
-
- o->object.type = htole64(OBJECT_ENTRY);
- o->entry.seqnum = htole64(journal_file_seqnum(f));
- memcpy(o->entry.items, items, n_items * sizeof(EntryItem));
- o->entry.realtime = htole64(ts->realtime);
- o->entry.monotonic = htole64(ts->monotonic);
-
- r = journal_file_link_entry(f, o, np);
- if (r < 0)
- return r;
-
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = np;
-
- return 0;
-}
-
-int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, Object **ret, uint64_t *offset) {
- unsigned i;
- EntryItem *items;
- int r;
-
- assert(f);
-
- items = new(EntryItem, n_iovec);
- if (!items)
- return -ENOMEM;
-
- for (i = 0; i < n_iovec; i++) {
- uint64_t p;
-
- r = journal_file_append_data(f, iovec[i].iov_base, iovec[i].iov_len, NULL, &p);
- if (r < 0)
- goto finish;
-
- items[i].object_offset = htole64(p);
- }
-
- r = journal_file_append_entry_internal(f, ts, items, n_iovec, ret, offset);
-
-finish:
- free(items);
-
- return r;
-}
-
-int journal_file_move_to_entry(JournalFile *f, uint64_t seqnum, Object **ret, uint64_t *offset) {
- Object *o;
- uint64_t lower, upper, p, n, k;
- int r;
-
- assert(f);
-
- n = le64toh(f->header->bisect_table_size) / sizeof(uint64_t);
- k = le64toh(f->header->arena_max_size) / n;
-
- lower = 0;
- upper = le64toh(f->header->last_bisect_offset)/k+1;
-
- while (lower < upper) {
- k = (upper + lower) / 2;
- p = le64toh(f->bisect_table[k]);
-
- if (p == 0) {
- upper = k;
- continue;
- }
-
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (o->object.type != htole64(OBJECT_ENTRY))
- return -EBADMSG;
-
- if (o->entry.seqnum == seqnum) {
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = p;
-
- return 1;
- } else if (seqnum < o->entry.seqnum)
- upper = k;
- else if (seqnum > o->entry.seqnum)
- lower = k+1;
- }
-
- assert(lower == upper);
-
- if (lower <= 0)
- return 0;
-
- /* The object we are looking for is between
- * bisect_table[lower-1] and bisect_table[lower] */
-
- p = le64toh(f->bisect_table[lower-1]);
-
- for (;;) {
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (o->entry.seqnum == seqnum) {
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = p;
-
- return 1;
-
- } if (seqnum < o->entry.seqnum)
- return 0;
-
- if (o->entry.next_entry_offset == 0)
- return 0;
-
- p = le64toh(o->entry.next_entry_offset);
- }
-
- return 0;
-}
-
-int journal_file_next_entry(JournalFile *f, Object *o, Object **ret, uint64_t *offset) {
- uint64_t np;
- int r;
-
- assert(f);
-
- if (!o)
- np = le64toh(f->header->head_entry_offset);
- else {
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EINVAL;
-
- np = le64toh(o->entry.next_entry_offset);
- }
-
- if (np == 0)
- return 0;
-
- r = journal_file_move_to_object(f, np, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EBADMSG;
-
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = np;
-
- return 1;
-}
-
-int journal_file_prev_entry(JournalFile *f, Object *o, Object **ret, uint64_t *offset) {
- uint64_t np;
- int r;
-
- assert(f);
-
- if (!o)
- np = le64toh(f->header->tail_entry_offset);
- else {
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EINVAL;
-
- np = le64toh(o->entry.prev_entry_offset);
- }
-
- if (np == 0)
- return 0;
-
- r = journal_file_move_to_object(f, np, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EBADMSG;
-
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = np;
-
- return 1;
-}
-
-int journal_file_find_first_entry(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset) {
- uint64_t p, osize, hash, h;
- int r;
-
- assert(f);
- assert(data || size == 0);
-
- osize = offsetof(Object, data.payload) + size;
-
- hash = hash64(data, size);
- h = hash % (le64toh(f->header->hash_table_size) / sizeof(HashItem));
- p = le64toh(f->hash_table[h].head_hash_offset);
-
- while (p != 0) {
- Object *o;
-
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_DATA)
- return -EBADMSG;
-
- if (le64toh(o->object.size) == osize &&
- memcmp(o->data.payload, data, size) == 0) {
-
- if (le64toh(o->data.hash) != hash)
- return -EBADMSG;
-
- if (o->data.head_entry_offset == 0)
- return 0;
-
- p = le64toh(o->data.head_entry_offset);
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EBADMSG;
-
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = p;
-
- return 1;
- }
-
- p = le64toh(o->data.next_hash_offset);
- }
-
- return 0;
-}
-
-int journal_file_find_last_entry(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset) {
- uint64_t p, osize, hash, h;
- int r;
-
- assert(f);
- assert(data || size == 0);
-
- osize = offsetof(Object, data.payload) + size;
-
- hash = hash64(data, size);
- h = hash % (le64toh(f->header->hash_table_size) / sizeof(HashItem));
- p = le64toh(f->hash_table[h].tail_hash_offset);
-
- while (p != 0) {
- Object *o;
-
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_DATA)
- return -EBADMSG;
-
- if (le64toh(o->object.size) == osize &&
- memcmp(o->data.payload, data, size) == 0) {
-
- if (le64toh(o->data.hash) != hash)
- return -EBADMSG;
-
- if (o->data.tail_entry_offset == 0)
- return 0;
-
- p = le64toh(o->data.tail_entry_offset);
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- return r;
-
- if (le64toh(o->object.type) != OBJECT_ENTRY)
- return -EBADMSG;
-
- if (ret)
- *ret = o;
-
- if (offset)
- *offset = p;
-
- return 1;
- }
-
- p = le64toh(o->data.prev_hash_offset);
- }
-
- return 0;
-}
-
-void journal_file_dump(JournalFile *f) {
- char a[33], b[33], c[33];
- Object *o;
- int r;
- uint64_t p;
-
- assert(f);
-
- printf("File ID: %s\n"
- "Machine ID: %s\n"
- "Boot ID: %s\n"
- "Arena size: %llu\n",
- sd_id128_to_string(f->header->file_id, a),
- sd_id128_to_string(f->header->machine_id, b),
- sd_id128_to_string(f->header->boot_id, c),
- (unsigned long long) le64toh(f->header->arena_size));
-
- p = le64toh(f->header->head_object_offset);
- while (p != 0) {
- r = journal_file_move_to_object(f, p, &o);
- if (r < 0)
- goto fail;
-
- switch (o->object.type) {
-
- case OBJECT_UNUSED:
- printf("Type: OBJECT_UNUSED\n");
- break;
-
- case OBJECT_DATA:
- printf("Type: OBJECT_DATA\n");
- break;
-
- case OBJECT_ENTRY:
- printf("Type: OBJECT_ENTRY %llu\n", (unsigned long long) le64toh(o->entry.seqnum));
- break;
-
- case OBJECT_HASH_TABLE:
- printf("Type: OBJECT_HASH_TABLE\n");
- break;
-
- case OBJECT_BISECT_TABLE:
- printf("Type: OBJECT_BISECT_TABLE\n");
- break;
- }
-
- if (p == le64toh(f->header->tail_object_offset))
- p = 0;
- else
- p = p + ALIGN64(le64toh(o->object.size));
- }
-
- return;
-fail:
- log_error("File corrupt");
-}
-
-int journal_file_open(
- sd_journal *j,
- const char *fname,
- int flags,
- mode_t mode,
- JournalFile **ret) {
-
- JournalFile *f;
- int r;
- bool newly_created = false;
-
- assert(fname);
-
- if ((flags & O_ACCMODE) != O_RDONLY &&
- (flags & O_ACCMODE) != O_RDWR)
- return -EINVAL;
-
- f = new0(JournalFile, 1);
- if (!f)
- return -ENOMEM;
-
- f->writable = (flags & O_ACCMODE) != O_RDONLY;
- f->prot = prot_from_flags(flags);
-
- f->fd = open(fname, flags|O_CLOEXEC, mode);
- if (f->fd < 0) {
- r = -errno;
- goto fail;
- }
-
- f->path = strdup(fname);
- if (!f->path) {
- r = -ENOMEM;
- goto fail;
- }
-
- if (fstat(f->fd, &f->last_stat) < 0) {
- r = -errno;
- goto fail;
- }
-
- if (f->last_stat.st_size == 0 && f->writable) {
- newly_created = true;
-
- r = journal_file_init_header(f);
- if (r < 0)
- goto fail;
-
- if (fstat(f->fd, &f->last_stat) < 0) {
- r = -errno;
- goto fail;
- }
- }
-
- if (f->last_stat.st_size < (off_t) sizeof(Header)) {
- r = -EIO;
- goto fail;
- }
-
- f->header = mmap(NULL, PAGE_ALIGN(sizeof(Header)), prot_from_flags(flags), MAP_SHARED, f->fd, 0);
- if (f->header == MAP_FAILED) {
- f->header = NULL;
- r = -errno;
- goto fail;
- }
-
- if (!newly_created) {
- r = journal_file_verify_header(f);
- if (r < 0)
- goto fail;
- }
-
- if (f->writable) {
- r = journal_file_refresh_header(f);
- if (r < 0)
- goto fail;
- }
-
- if (newly_created) {
-
- r = journal_file_setup_hash_table(f);
- if (r < 0)
- goto fail;
-
- r = journal_file_setup_bisect_table(f);
- if (r < 0)
- goto fail;
- }
-
- r = journal_file_map_hash_table(f);
- if (r < 0)
- goto fail;
-
- r = journal_file_map_bisect_table(f);
- if (r < 0)
- goto fail;
-
- if (j) {
- LIST_PREPEND(JournalFile, files, j->files, f);
- f->journal = j;
- }
-
- if (ret)
- *ret = f;
-
- return 0;
-
-fail:
- journal_file_close(f);
-
- return r;
+int sd_journal_seek_head(sd_journal *j) {
+ assert(j);
+ return -EINVAL;
}
-int sd_journal_open(sd_journal **ret) {
- sd_journal *j;
- char *fn;
- const char *p;
- int r = 0;
- const char search_paths[] =
- "/run/log/journal\0"
- "/var/log/journal\0";
-
- assert(ret);
-
- j = new0(sd_journal, 1);
- if (!j)
- return -ENOMEM;
-
- NULSTR_FOREACH(p, search_paths) {
- DIR *d;
-
- d = opendir(p);
- if (!d) {
- if (errno != ENOENT && r == 0)
- r = -errno;
-
- continue;
- }
-
- for (;;) {
- struct dirent buf, *de;
- int k;
-
- k = readdir_r(d, &buf, &de);
- if (k != 0) {
- if (r == 0)
- r = -k;
-
- break;
- }
-
- if (!de)
- break;
-
- if (!dirent_is_file_with_suffix(de, ".journal"))
- continue;
-
- fn = join(p, "/", de->d_name, NULL);
- if (!fn) {
- r = -ENOMEM;
- closedir(d);
- goto fail;
- }
-
- k = journal_file_open(j, fn, O_RDONLY, 0, NULL);
- if (k < 0 && r == 0)
- r = -k;
-
- free(fn);
- }
- }
-
- if (!j->files) {
- if (r >= 0)
- r = -ENOENT;
-
- goto fail;
- }
-
- *ret = j;
- return 0;
-
-fail:
- sd_journal_close(j);
-
- return r;
-};
-
-void sd_journal_close(sd_journal *j) {
+int sd_journal_seek_tail(sd_journal *j) {
assert(j);
-
- while (j->files)
- journal_file_close(j->files);
-
- free(j);
+ return -EINVAL;
}