#include "hashmap.h"
#include "list.h"
#include "lookup3.h"
+#include "compress.h"
+#include "journal-internal.h"
#define JOURNAL_FILES_MAX 1024
-typedef struct Match Match;
-
-struct Match {
- char *data;
- size_t size;
- uint64_t le_hash;
-
- LIST_FIELDS(Match, matches);
-};
-
-typedef enum location_type {
- LOCATION_HEAD,
- LOCATION_TAIL,
- LOCATION_DISCRETE
-} location_type_t;
-
-typedef struct Location {
- location_type_t type;
-
- uint64_t seqnum;
- sd_id128_t seqnum_id;
- bool seqnum_set;
-
- uint64_t realtime;
- bool realtime_set;
-
- uint64_t monotonic;
- sd_id128_t boot_id;
- bool monotonic_set;
-
- uint64_t xor_hash;
- bool xor_hash_set;
-} Location;
-
-struct sd_journal {
- Hashmap *files;
-
- Location current_location;
- JournalFile *current_file;
- uint64_t current_field;
-
- int inotify_fd;
- Hashmap *inotify_wd_dirs;
- Hashmap *inotify_wd_roots;
-
- LIST_HEAD(Match, matches);
- unsigned n_matches;
-};
-
static void detach_location(sd_journal *j) {
Iterator i;
JournalFile *f;
return -EINVAL;
}
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
+_public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
Match *m, *after = NULL;
uint64_t le_hash;
- assert(j);
-
+ if (!j)
+ return -EINVAL;
+ if (!data)
+ return -EINVAL;
if (size <= 0)
return -EINVAL;
- assert(data);
-
le_hash = htole64(hash64(data, size));
LIST_FOREACH(matches, m, j->matches) {
return 0;
}
-void sd_journal_flush_matches(sd_journal *j) {
- assert(j);
+_public_ void sd_journal_flush_matches(sd_journal *j) {
+ if (!j)
+ return;
while (j->matches) {
Match *m = j->matches;
r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
if (r <= 0)
- return r;
+ return r == -ENOENT ? 0 : r;
}
LIST_FOREACH(matches, m, j->matches) {
else
r = journal_file_next_entry_for_data(f, NULL, 0, dp, direction, &c, &cp);
+ if (r < 0)
+ return r;
+
if (!term_match) {
term_match = m;
(direction == DIRECTION_DOWN && cp < tp) ||
(direction == DIRECTION_UP && cp > tp)) {
to = c;
- tp = tp;
+ tp = cp;
}
}
uint64_t np, n;
bool found, term_result = false;
Match *m, *term_match = NULL;
+ Object *npo = NULL;
n = journal_file_entry_n_items(c);
/* Make sure we don't match the entry we are starting
* from. */
- found = cp > *offset;
+ found = cp != *offset;
np = 0;
LIST_FOREACH(matches, m, j->matches) {
uint64_t q, k;
+ Object *qo = NULL;
/* Let's check if this is the beginning of a
* new term, i.e. has a different field prefix
* where we'd have to try next, in case the other
* matches are not OK */
- r = journal_file_next_entry_for_data(f, c, cp, le64toh(c->entry.items[k].object_offset), direction, NULL, &q);
+ r = journal_file_next_entry_for_data(f, c, cp, le64toh(c->entry.items[k].object_offset), direction, &qo, &q);
+ if (r < 0)
+ return r;
+
if (r > 0) {
if (direction == DIRECTION_DOWN) {
- if (q > np)
+ if (q > np) {
np = q;
+ npo = qo;
+ }
} else {
- if (np == 0 || q < np)
+ if (np == 0 || q < np) {
np = q;
+ npo = qo;
+ }
}
}
}
/* Check the last term */
- if (term_match && term_result)
- found = true;
+ if (term_match && !term_result)
+ found = false;
/* Did this entry match against all matches? */
if (found) {
/* Hmm, ok, this entry only matched partially, so
* let's try another one */
cp = np;
+ c = npo;
}
}
assert(f);
if (f->current_offset > 0) {
- r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &c);
+ cp = f->current_offset;
+
+ r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c);
if (r < 0)
return r;
- cp = f->current_offset;
-
r = next_with_matches(j, f, direction, &c, &cp);
if (r <= 0)
return r;
uint64_t new_offset = 0;
Object *new_entry = NULL;
- assert(j);
+ if (!j)
+ return -EINVAL;
HASHMAP_FOREACH(f, j->files, i) {
Object *o;
return 1;
}
-int sd_journal_next(sd_journal *j) {
+_public_ int sd_journal_next(sd_journal *j) {
return real_journal_next(j, DIRECTION_DOWN);
}
-int sd_journal_previous(sd_journal *j) {
+_public_ int sd_journal_previous(sd_journal *j) {
return real_journal_next(j, DIRECTION_UP);
}
-int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
+static int real_journal_next_skip(sd_journal *j, direction_t direction, uint64_t skip) {
int c = 0, r;
- assert(j);
+ if (!j)
+ return -EINVAL;
+
+ if (skip == 0) {
+ /* If this is not a discrete skip, then at least
+ * resolve the current location */
+ if (j->current_location.type != LOCATION_DISCRETE)
+ return real_journal_next(j, direction);
- while (skip > 0) {
- r = sd_journal_next(j);
+ return 0;
+ }
+
+ do {
+ r = real_journal_next(j, direction);
if (r < 0)
return r;
skip--;
c++;
- }
+ } while (skip > 0);
return c;
}
-int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
- int c = 0, r;
-
- assert(j);
-
- while (skip > 0) {
- r = sd_journal_previous(j);
- if (r < 0)
- return r;
-
- if (r == 0)
- return c;
-
- skip--;
- c++;
- }
+_public_ int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
+ return real_journal_next_skip(j, DIRECTION_DOWN, skip);
+}
- return 1;
+_public_ int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
+ return real_journal_next_skip(j, DIRECTION_UP, skip);
}
-int sd_journal_get_cursor(sd_journal *j, char **cursor) {
+_public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
Object *o;
int r;
char bid[33], sid[33];
- assert(j);
- assert(cursor);
+ if (!j)
+ return -EINVAL;
+ if (!cursor)
+ return -EINVAL;
if (!j->current_file || j->current_file->current_offset <= 0)
return -EADDRNOTAVAIL;
return 1;
}
-int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
+_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
char *w;
size_t l;
char *state;
xor_hash_set = false;
sd_id128_t seqnum_id, boot_id;
- assert(j);
- assert(cursor);
+ if (!j)
+ return -EINVAL;
+ if (!cursor)
+ return -EINVAL;
FOREACH_WORD_SEPARATOR(w, l, cursor, ";", state) {
char *item;
return 0;
}
-int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) {
- assert(j);
+_public_ int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) {
+ if (!j)
+ return -EINVAL;
reset_location(j);
j->current_location.type = LOCATION_DISCRETE;
return 0;
}
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
- assert(j);
+_public_ int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
+ if (!j)
+ return -EINVAL;
reset_location(j);
j->current_location.type = LOCATION_DISCRETE;
return 0;
}
-int sd_journal_seek_head(sd_journal *j) {
- assert(j);
+_public_ int sd_journal_seek_head(sd_journal *j) {
+ if (!j)
+ return -EINVAL;
reset_location(j);
j->current_location.type = LOCATION_HEAD;
return 0;
}
-int sd_journal_seek_tail(sd_journal *j) {
- assert(j);
+_public_ int sd_journal_seek_tail(sd_journal *j) {
+ if (!j)
+ return -EINVAL;
reset_location(j);
j->current_location.type = LOCATION_TAIL;
assert(prefix);
assert(filename);
+ if ((j->flags & SD_JOURNAL_SYSTEM_ONLY) &&
+ !startswith(filename, "system.journal"))
+ return 0;
+
if (dir)
fn = join(prefix, "/", dir, "/", filename, NULL);
else
return r;
}
- journal_file_dump(f);
+ /* journal_file_dump(f); */
r = hashmap_put(j->files, f->path, f);
if (r < 0) {
int r;
DIR *d;
int wd;
+ sd_id128_t id, mid;
assert(j);
assert(prefix);
assert(dir);
+ if ((j->flags & SD_JOURNAL_LOCAL_ONLY) &&
+ (sd_id128_from_string(dir, &id) < 0 ||
+ sd_id128_get_machine(&mid) < 0 ||
+ !sd_id128_equal(id, mid)))
+ return 0;
+
fn = join(prefix, "/", dir, NULL);
if (!fn)
return -ENOMEM;
}
}
-int sd_journal_open(sd_journal **ret) {
+_public_ int sd_journal_open(sd_journal **ret, int flags) {
sd_journal *j;
const char *p;
const char search_paths[] =
"/var/log/journal\0";
int r;
- assert(ret);
+ if (!ret)
+ return -EINVAL;
+
+ if (flags & ~(SD_JOURNAL_LOCAL_ONLY|
+ SD_JOURNAL_RUNTIME_ONLY|
+ SD_JOURNAL_SYSTEM_ONLY))
+ return -EINVAL;
j = new0(sd_journal, 1);
if (!j)
return -ENOMEM;
+ j->flags = flags;
+
j->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
if (j->inotify_fd < 0) {
r = -errno;
NULSTR_FOREACH(p, search_paths) {
DIR *d;
+ if ((flags & SD_JOURNAL_RUNTIME_ONLY) &&
+ !path_startswith(p, "/run"))
+ continue;
+
d = opendir(p);
if (!d) {
if (errno != ENOENT)
return r;
};
-void sd_journal_close(sd_journal *j) {
- assert(j);
+_public_ void sd_journal_close(sd_journal *j) {
+ if (!j)
+ return;
if (j->inotify_wd_dirs) {
void *k;
free(j);
}
-int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
+_public_ int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
Object *o;
JournalFile *f;
int r;
- assert(j);
- assert(ret);
+ if (!j)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
f = j->current_file;
if (!f)
return 0;
}
-int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id) {
+_public_ int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id) {
Object *o;
JournalFile *f;
int r;
sd_id128_t id;
- assert(j);
- assert(ret);
+ if (!j)
+ return -EINVAL;
+ if (!ret)
+ return -EINVAL;
f = j->current_file;
if (!f)
return r;
if (!sd_id128_equal(id, o->entry.boot_id))
- return -ENOENT;
+ return -ESTALE;
}
*ret = le64toh(o->entry.monotonic);
return 0;
}
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
+_public_ int sd_journal_get_data(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(j);
- assert(field);
- assert(data);
- assert(size);
+ if (!j)
+ return -EINVAL;
+ if (!field)
+ return -EINVAL;
+ if (!data)
+ return -EINVAL;
+ if (!size)
+ return -EINVAL;
if (isempty(field) || strchr(field, '='))
return -EINVAL;
size_t t;
p = le64toh(o->entry.items[i].object_offset);
- le_hash = o->entry.items[j->current_field].hash;
+ le_hash = o->entry.items[i].hash;
r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
if (r < 0)
return r;
l = le64toh(o->object.size) - offsetof(Object, data.payload);
- if (l >= field_length+1 &&
- memcmp(o->data.payload, field, field_length) == 0 &&
- o->data.payload[field_length] == '=') {
+ if (o->object.flags & OBJECT_COMPRESSED) {
+
+#ifdef HAVE_XZ
+ if (uncompress_startswith(o->data.payload, l,
+ &f->compress_buffer, &f->compress_buffer_size,
+ field, field_length, '=')) {
+
+ uint64_t rsize;
+
+ if (!uncompress_blob(o->data.payload, l,
+ &f->compress_buffer, &f->compress_buffer_size, &rsize))
+ return -EBADMSG;
+
+ *data = f->compress_buffer;
+ *size = (size_t) rsize;
+
+ return 0;
+ }
+#else
+ return -EPROTONOSUPPORT;
+#endif
+
+ } else if (l >= field_length+1 &&
+ memcmp(o->data.payload, field, field_length) == 0 &&
+ o->data.payload[field_length] == '=') {
t = (size_t) l;
return -ENOENT;
}
-int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
+_public_ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
JournalFile *f;
uint64_t p, l, n, le_hash;
int r;
Object *o;
size_t t;
- assert(j);
- assert(data);
- assert(size);
+ if (!j)
+ return -EINVAL;
+ if (!data)
+ return -EINVAL;
+ if (!size)
+ return -EINVAL;
f = j->current_file;
if (!f)
if ((uint64_t) t != l)
return -E2BIG;
- *data = o->data.payload;
- *size = t;
+ if (o->object.flags & OBJECT_COMPRESSED) {
+#ifdef HAVE_XZ
+ uint64_t rsize;
+
+ if (!uncompress_blob(o->data.payload, l, &f->compress_buffer, &f->compress_buffer_size, &rsize))
+ return -EBADMSG;
+
+ *data = f->compress_buffer;
+ *size = (size_t) rsize;
+#else
+ return -EPROTONOSUPPORT;
+#endif
+ } else {
+ *data = o->data.payload;
+ *size = t;
+ }
j->current_field ++;
return 1;
}
-void sd_journal_restart_data(sd_journal *j) {
- assert(j);
+_public_ void sd_journal_restart_data(sd_journal *j) {
+ if (!j)
+ return;
j->current_field = 0;
}
-int sd_journal_get_fd(sd_journal *j) {
- assert(j);
+_public_ int sd_journal_get_fd(sd_journal *j) {
+ if (!j)
+ return -EINVAL;
return j->inotify_fd;
}
log_warning("Unknown inotify event.");
}
-int sd_journal_process(sd_journal *j) {
+_public_ int sd_journal_process(sd_journal *j) {
uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX];
- assert(j);
+ if (!j)
+ return -EINVAL;
for (;;) {
struct inotify_event *e;
}
}
}
+
+/* _public_ int sd_journal_query_unique(sd_journal *j, const char *field) { */
+/* if (!j) */
+/* return -EINVAL; */
+/* if (!field) */
+/* return -EINVAL; */
+
+/* return -ENOTSUP; */
+/* } */
+
+/* _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) { */
+/* if (!j) */
+/* return -EINVAL; */
+/* if (!data) */
+/* return -EINVAL; */
+/* if (!l) */
+/* return -EINVAL; */
+
+/* return -ENOTSUP; */
+/* } */
+
+/* _public_ void sd_journal_restart_unique(sd_journal *j) { */
+/* if (!j) */
+/* return; */
+/* } */
~ianmdlvl / elogind.git / blobdiff