Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <stddef.h>
#include <unistd.h>
#include <sys/inotify.h>
+#include <sys/poll.h>
#include "sd-journal.h"
#include "journal-def.h"
#include "journal-file.h"
#include "hashmap.h"
#include "list.h"
+#include "path-util.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;
l->seqnum_id = f->header->seqnum_id;
l->realtime = le64toh(o->entry.realtime);
l->monotonic = le64toh(o->entry.monotonic);
- l->boot_id = le64toh(o->entry.boot_id);
+ l->boot_id = o->entry.boot_id;
l->xor_hash = le64toh(o->entry.xor_hash);
l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;
f->current_offset = offset;
}
-static int same_field(const void *_a, size_t s, const void *_b, size_t t) {
+static int match_is_valid(const void *data, size_t size) {
+ const char *b, *p;
+
+ assert(data);
+
+ if (size < 2)
+ return false;
+
+ if (startswith(data, "__"))
+ return false;
+
+ b = data;
+ for (p = b; p < b + size; p++) {
+
+ if (*p == '=')
+ return p > b;
+
+ if (*p == '_')
+ continue;
+
+ if (*p >= 'A' && *p <= 'Z')
+ continue;
+
+ if (*p >= '0' && *p <= '9')
+ continue;
+
+ return false;
+ }
+
+ return false;
+}
+
+static bool same_field(const void *_a, size_t s, const void *_b, size_t t) {
const uint8_t *a = _a, *b = _b;
size_t j;
- bool a_good = false, b_good = false, different = false;
for (j = 0; j < s && j < t; j++) {
- if (a[j] == '=')
- a_good = true;
- if (b[j] == '=')
- b_good = true;
if (a[j] != b[j])
- different = true;
+ return false;
+
+ if (a[j] == '=')
+ return true;
+ }
+
+ return true;
+}
+
+static Match *match_new(Match *p, MatchType t) {
+ Match *m;
+
+ m = new0(Match, 1);
+ if (!m)
+ return NULL;
- if (a_good && b_good)
- return different ? 0 : 1;
+ m->type = t;
+
+ if (p) {
+ m->parent = p;
+ LIST_PREPEND(Match, matches, p->matches, m);
}
- return -EINVAL;
+ return m;
}
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
- Match *m, *after = NULL;
- uint64_t le_hash;
+static void match_free(Match *m) {
+ assert(m);
- assert(j);
+ while (m->matches)
+ match_free(m->matches);
+
+ if (m->parent)
+ LIST_REMOVE(Match, matches, m->parent->matches, m);
+
+ free(m->data);
+ free(m);
+}
+
+static void match_free_if_empty(Match *m) {
+ assert(m);
+
+ if (m->matches)
+ return;
+
+ match_free(m);
+}
+
+_public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
+ Match *l2, *l3, *add_here = NULL, *m;
+ le64_t le_hash;
- if (size <= 0)
+ if (!j)
return -EINVAL;
- assert(data);
+ if (!data)
+ return -EINVAL;
- le_hash = htole64(hash64(data, size));
+ if (size == 0)
+ size = strlen(data);
- LIST_FOREACH(matches, m, j->matches) {
- int r;
+ if (!match_is_valid(data, size))
+ return -EINVAL;
- if (m->le_hash == le_hash &&
- m->size == size &&
- memcmp(m->data, data, size) == 0)
- return 0;
+ /* level 0: OR term
+ * level 1: AND terms
+ * level 2: OR terms
+ * level 3: concrete matches */
- r = same_field(data, size, m->data, m->size);
- if (r < 0)
- return r;
- else if (r > 0)
- after = m;
+ if (!j->level0) {
+ j->level0 = match_new(NULL, MATCH_OR_TERM);
+ if (!j->level0)
+ return -ENOMEM;
}
- m = new0(Match, 1);
- if (!m)
- return -ENOMEM;
+ if (!j->level1) {
+ j->level1 = match_new(j->level0, MATCH_AND_TERM);
+ if (!j->level1)
+ return -ENOMEM;
+ }
- m->size = size;
+ assert(j->level0->type == MATCH_OR_TERM);
+ assert(j->level1->type == MATCH_AND_TERM);
- m->data = malloc(m->size);
- if (!m->data) {
- free(m);
- return -ENOMEM;
+ le_hash = htole64(hash64(data, size));
+
+ LIST_FOREACH(matches, l2, j->level1->matches) {
+ assert(l2->type == MATCH_OR_TERM);
+
+ LIST_FOREACH(matches, l3, l2->matches) {
+ assert(l3->type == MATCH_DISCRETE);
+
+ /* Exactly the same match already? Then ignore
+ * this addition */
+ if (l3->le_hash == le_hash &&
+ l3->size == size &&
+ memcmp(l3->data, data, size) == 0)
+ return 0;
+
+ /* Same field? Then let's add this to this OR term */
+ if (same_field(data, size, l3->data, l3->size)) {
+ add_here = l2;
+ break;
+ }
+ }
+
+ if (add_here)
+ break;
}
- memcpy(m->data, data, size);
- m->le_hash = le_hash;
+ if (!add_here) {
+ add_here = match_new(j->level1, MATCH_OR_TERM);
+ if (!add_here)
+ goto fail;
+ }
+
+ m = match_new(add_here, MATCH_DISCRETE);
+ if (!m)
+ goto fail;
- /* Matches for the same fields we order adjacent to each
- * other */
- LIST_INSERT_AFTER(Match, matches, j->matches, after, m);
- j->n_matches ++;
+ m->le_hash = le_hash;
+ m->size = size;
+ m->data = memdup(data, size);
+ if (!m->data)
+ goto fail;
detach_location(j);
return 0;
+
+fail:
+ if (add_here)
+ match_free_if_empty(add_here);
+
+ if (j->level1)
+ match_free_if_empty(j->level1);
+
+ if (j->level0)
+ match_free_if_empty(j->level0);
+
+ return -ENOMEM;
}
-void sd_journal_flush_matches(sd_journal *j) {
+_public_ int sd_journal_add_disjunction(sd_journal *j) {
+ Match *m;
+
assert(j);
- while (j->matches) {
- Match *m = j->matches;
+ if (!j->level0)
+ return 0;
+
+ if (!j->level1)
+ return 0;
+
+ if (!j->level1->matches)
+ return 0;
+
+ m = match_new(j->level0, MATCH_AND_TERM);
+ if (!m)
+ return -ENOMEM;
+
+ j->level1 = m;
+ return 0;
+}
+
+static char *match_make_string(Match *m) {
+ char *p, *r;
+ Match *i;
+ bool enclose = false;
+
+ if (!m)
+ return strdup("");
+
+ if (m->type == MATCH_DISCRETE)
+ return strndup(m->data, m->size);
+
+ p = NULL;
+ LIST_FOREACH(matches, i, m->matches) {
+ char *t, *k;
+
+ t = match_make_string(i);
+ if (!t) {
+ free(p);
+ return NULL;
+ }
+
+ if (p) {
+ k = strjoin(p, m->type == MATCH_OR_TERM ? " OR " : " AND ", t, NULL);
+ free(p);
+ free(t);
- LIST_REMOVE(Match, matches, j->matches, m);
- free(m->data);
- free(m);
+ if (!k)
+ return NULL;
+
+ p = k;
+
+ enclose = true;
+ } else {
+ free(p);
+ p = t;
+ }
+ }
+
+ if (enclose) {
+ r = strjoin("(", p, ")", NULL);
+ free(p);
+ return r;
}
- j->n_matches = 0;
+ return p;
+}
+
+char *journal_make_match_string(sd_journal *j) {
+ assert(j);
+
+ return match_make_string(j->level0);
+}
+
+_public_ void sd_journal_flush_matches(sd_journal *j) {
+
+ if (!j)
+ return;
+
+ if (j->level0)
+ match_free(j->level0);
+
+ j->level0 = j->level1 = NULL;
detach_location(j);
}
/* Otherwise compare UTC time */
a = le64toh(ao->entry.realtime);
- b = le64toh(ao->entry.realtime);
+ b = le64toh(bo->entry.realtime);
if (a < b)
return -1;
/* Finally, compare by contents */
a = le64toh(ao->entry.xor_hash);
- b = le64toh(ao->entry.xor_hash);
+ b = le64toh(bo->entry.xor_hash);
if (a < b)
return -1;
return 0;
}
-static int find_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
- Object *o = NULL;
- uint64_t p = 0;
+static int next_for_match(
+ sd_journal *j,
+ Match *m,
+ JournalFile *f,
+ uint64_t after_offset,
+ direction_t direction,
+ Object **ret,
+ uint64_t *offset) {
+
int r;
+ uint64_t np = 0;
+ Object *n;
assert(j);
+ assert(m);
+ assert(f);
- if (!j->matches) {
- /* No matches is simple */
-
- if (j->current_location.type == LOCATION_HEAD)
- r = journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p);
- else if (j->current_location.type == LOCATION_TAIL)
- r = journal_file_next_entry(f, NULL, 0, DIRECTION_UP, &o, &p);
- else if (j->current_location.seqnum_set &&
- sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
- r = journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, &o, &p);
- else if (j->current_location.monotonic_set)
- r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
- else if (j->current_location.realtime_set)
- r = journal_file_move_to_entry_by_realtime(f, j->current_location.realtime, direction, &o, &p);
- else
- r = journal_file_next_entry(f, NULL, 0, direction, &o, &p);
+ if (m->type == MATCH_DISCRETE) {
+ uint64_t dp;
+ r = journal_file_find_data_object_with_hash(f, m->data, m->size, le64toh(m->le_hash), NULL, &dp);
if (r <= 0)
return r;
- } else {
- Match *m, *term_match = NULL;
- Object *to = NULL;
- uint64_t tp = 0;
+ return journal_file_move_to_entry_by_offset_for_data(f, dp, after_offset, direction, ret, offset);
- /* We have matches, first, let's jump to the monotonic
- * position if we have any, since it implies a
- * match. */
+ } else if (m->type == MATCH_OR_TERM) {
+ Match *i;
- if (j->current_location.type == LOCATION_DISCRETE &&
- j->current_location.monotonic_set) {
+ /* Find the earliest match beyond after_offset */
- r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
- if (r <= 0)
+ LIST_FOREACH(matches, i, m->matches) {
+ uint64_t cp;
+
+ r = next_for_match(j, i, f, after_offset, direction, NULL, &cp);
+ if (r < 0)
return r;
+ else if (r > 0) {
+ if (np == 0 || (direction == DIRECTION_DOWN ? np > cp : np < cp))
+ np = cp;
+ }
}
- LIST_FOREACH(matches, m, j->matches) {
- Object *c, *d;
- uint64_t cp, dp;
-
- r = journal_file_find_data_object_with_hash(f, m->data, m->size, m->le_hash, &d, &dp);
- if (r <= 0)
- return r;
+ } else if (m->type == MATCH_AND_TERM) {
+ Match *i;
+ bool continue_looking;
- if (j->current_location.type == LOCATION_HEAD)
- r = journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_DOWN, &c, &cp);
- else if (j->current_location.type == LOCATION_TAIL)
- r = journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_UP, &c, &cp);
- else if (j->current_location.seqnum_set &&
- sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
- r = journal_file_move_to_entry_by_seqnum_for_data(f, dp, j->current_location.seqnum, direction, &c, &cp);
- else if (j->current_location.realtime_set)
- r = journal_file_move_to_entry_by_realtime_for_data(f, dp, j->current_location.realtime, direction, &c, &cp);
- else
- r = journal_file_next_entry_for_data(f, NULL, 0, dp, direction, &c, &cp);
+ /* Always jump to the next matching entry and repeat
+ * this until we fine and offset that matches for all
+ * matches. */
- if (!term_match) {
- term_match = m;
+ if (!m->matches)
+ return 0;
- if (r > 0) {
- to = c;
- tp = cp;
+ np = 0;
+ do {
+ continue_looking = false;
+
+ LIST_FOREACH(matches, i, m->matches) {
+ uint64_t cp, limit;
+
+ if (np == 0)
+ limit = after_offset;
+ else if (direction == DIRECTION_DOWN)
+ limit = MAX(np, after_offset);
+ else
+ limit = MIN(np, after_offset);
+
+ r = next_for_match(j, i, f, limit, direction, NULL, &cp);
+ if (r <= 0)
+ return r;
+
+ if ((direction == DIRECTION_DOWN ? cp >= after_offset : cp <= after_offset) &&
+ (np == 0 || (direction == DIRECTION_DOWN ? cp > np : np < cp))) {
+ np = cp;
+ continue_looking = true;
}
- } else if (same_field(term_match->data, term_match->size, m->data, m->size)) {
-
- /* Same field as previous match... */
- if (r > 0) {
+ }
- /* Find the earliest of the OR matches */
+ } while (continue_looking);
+ }
- if (!to ||
- (direction == DIRECTION_DOWN && cp < tp) ||
- (direction == DIRECTION_UP && cp > tp)) {
- to = c;
- tp = tp;
- }
+ if (np == 0)
+ return 0;
- }
+ r = journal_file_move_to_object(f, OBJECT_ENTRY, np, &n);
+ if (r < 0)
+ return r;
- } else {
+ if (ret)
+ *ret = n;
+ if (offset)
+ *offset = np;
- /* Previous term is finished, did anything match? */
- if (!to)
- return 0;
+ return 1;
+}
- /* Find the last of the AND matches */
- if (!o ||
- (direction == DIRECTION_DOWN && tp > p) ||
- (direction == DIRECTION_UP && tp < p)) {
- o = to;
- p = tp;
- }
+static int find_location_for_match(
+ sd_journal *j,
+ Match *m,
+ JournalFile *f,
+ direction_t direction,
+ Object **ret,
+ uint64_t *offset) {
- term_match = m;
+ int r;
- if (r > 0) {
- to = c;
- tp = cp;
- } else {
- to = NULL;
- tp = 0;
- }
- }
- }
+ assert(j);
+ assert(m);
+ assert(f);
- /* Last term is finished, did anything match? */
- if (!to)
- return 0;
+ if (m->type == MATCH_DISCRETE) {
+ uint64_t dp;
- if (!o ||
- (direction == DIRECTION_DOWN && tp > p) ||
- (direction == DIRECTION_UP && tp < p)) {
- o = to;
- p = tp;
- }
+ r = journal_file_find_data_object_with_hash(f, m->data, m->size, le64toh(m->le_hash), NULL, &dp);
+ if (r <= 0)
+ return r;
- if (!o)
- return 0;
- }
+ /* FIXME: missing: find by monotonic */
- if (ret)
- *ret = o;
+ if (j->current_location.type == LOCATION_HEAD)
+ return journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_DOWN, ret, offset);
+ if (j->current_location.type == LOCATION_TAIL)
+ return journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_UP, ret, offset);
+ if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
+ return journal_file_move_to_entry_by_seqnum_for_data(f, dp, j->current_location.seqnum, direction, ret, offset);
+ if (j->current_location.monotonic_set) {
+ r = journal_file_move_to_entry_by_monotonic_for_data(f, dp, j->current_location.boot_id, j->current_location.monotonic, direction, ret, offset);
+ if (r != -ENOENT)
+ return r;
+ }
+ if (j->current_location.realtime_set)
+ return journal_file_move_to_entry_by_realtime_for_data(f, dp, j->current_location.realtime, direction, ret, offset);
- if (offset)
- *offset = p;
+ return journal_file_next_entry_for_data(f, NULL, 0, dp, direction, ret, offset);
- return 1;
-}
+ } else if (m->type == MATCH_OR_TERM) {
+ uint64_t np = 0;
+ Object *n;
+ Match *i;
-static int next_with_matches(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
- int r;
- uint64_t cp;
- Object *c;
+ /* Find the earliest match */
- assert(j);
- assert(f);
- assert(ret);
- assert(offset);
+ LIST_FOREACH(matches, i, m->matches) {
+ uint64_t cp;
- c = *ret;
- cp = *offset;
+ r = find_location_for_match(j, i, f, direction, NULL, &cp);
+ if (r < 0)
+ return r;
+ else if (r > 0) {
+ if (np == 0 || (direction == DIRECTION_DOWN ? np > cp : np < cp))
+ np = cp;
+ }
+ }
- if (!j->matches) {
- /* No matches is easy */
+ if (np == 0)
+ return 0;
- r = journal_file_next_entry(f, c, cp, direction, &c, &cp);
- if (r <= 0)
+ r = journal_file_move_to_object(f, OBJECT_ENTRY, np, &n);
+ if (r < 0)
return r;
if (ret)
- *ret = c;
+ *ret = n;
if (offset)
- *offset = cp;
- return 1;
- }
+ *offset = np;
- /* So there are matches we have to adhere to, let's find the
- * first entry that matches all of them */
+ return 1;
- for (;;) {
- uint64_t np, n;
- bool found, term_result = false;
- Match *m, *term_match = NULL;
- Object *npo = NULL;
+ } else {
+ Match *i;
+ uint64_t np = 0;
- n = journal_file_entry_n_items(c);
+ assert(m->type == MATCH_AND_TERM);
- /* Make sure we don't match the entry we are starting
- * from. */
- found = cp > *offset;
+ /* First jump to the last match, and then find the
+ * next one where all matches match */
- 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
- * as the preceeding match. */
- if (!term_match) {
- term_match = m;
- term_result = false;
- } else if (!same_field(term_match->data, term_match->size, m->data, m->size)) {
- if (!term_result)
- found = false;
-
- term_match = m;
- term_result = false;
- }
+ if (!m->matches)
+ return 0;
- for (k = 0; k < n; k++)
- if (c->entry.items[k].hash == m->le_hash)
- break;
+ LIST_FOREACH(matches, i, m->matches) {
+ uint64_t cp;
- if (k >= n) {
- /* Hmm, didn't find any field that
- * matched this rule, so ignore this
- * match. Go on with next match */
- continue;
- }
+ r = find_location_for_match(j, i, f, direction, NULL, &cp);
+ if (r <= 0)
+ return r;
- term_result = true;
-
- /* Hmm, so, this field matched, let's remember
- * 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, &qo, &q);
- if (r > 0) {
-
- if (direction == DIRECTION_DOWN) {
- if (q > np) {
- np = q;
- npo = qo;
- }
- } else {
- if (np == 0 || q < np) {
- np = q;
- npo = qo;
- }
- }
- }
+ if (np == 0 || (direction == DIRECTION_DOWN ? np < cp : np > cp))
+ np = cp;
}
- /* Check the last term */
- if (term_match && !term_result)
- found = false;
+ return next_for_match(j, m, f, np, direction, ret, offset);
+ }
+}
- /* Did this entry match against all matches? */
- if (found) {
- if (ret)
- *ret = c;
- if (offset)
- *offset = cp;
- return 1;
+static int find_location_with_matches(
+ sd_journal *j,
+ JournalFile *f,
+ direction_t direction,
+ Object **ret,
+ uint64_t *offset) {
+
+ int r;
+
+ assert(j);
+ assert(f);
+ assert(ret);
+ assert(offset);
+
+ if (!j->level0) {
+ /* No matches is simple */
+
+ if (j->current_location.type == LOCATION_HEAD)
+ return journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, ret, offset);
+ if (j->current_location.type == LOCATION_TAIL)
+ return journal_file_next_entry(f, NULL, 0, DIRECTION_UP, ret, offset);
+ if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
+ return journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, ret, offset);
+ if (j->current_location.monotonic_set) {
+ r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, ret, offset);
+ if (r != -ENOENT)
+ return r;
}
+ if (j->current_location.realtime_set)
+ return journal_file_move_to_entry_by_realtime(f, j->current_location.realtime, direction, ret, offset);
- /* Did we find a subsequent entry? */
- if (np == 0)
- return 0;
+ return journal_file_next_entry(f, NULL, 0, direction, ret, offset);
+ } else
+ return find_location_for_match(j, j->level0, f, direction, ret, offset);
+}
- /* Hmm, ok, this entry only matched partially, so
- * let's try another one */
- cp = np;
- c = npo;
- }
+static int next_with_matches(
+ sd_journal *j,
+ JournalFile *f,
+ direction_t direction,
+ Object **ret,
+ uint64_t *offset) {
+
+ Object *c;
+ uint64_t cp;
+
+ assert(j);
+ assert(f);
+ assert(ret);
+ assert(offset);
+
+ c = *ret;
+ cp = *offset;
+
+ /* No matches is easy. We simple advance the file
+ * pointer by one. */
+ if (!j->level0)
+ return journal_file_next_entry(f, c, cp, direction, ret, offset);
+
+ /* If we have a match then we look for the next matching entry
+ * with an offset at least one step larger */
+ return next_for_match(j, j->level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset);
}
static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
Object *c;
uint64_t cp;
- int compare_value, r;
+ int r;
assert(j);
assert(f);
r = next_with_matches(j, f, direction, &c, &cp);
if (r <= 0)
return r;
-
- compare_value = 1;
} else {
- r = find_location(j, f, direction, &c, &cp);
+ r = find_location_with_matches(j, f, direction, &c, &cp);
if (r <= 0)
return r;
-
- compare_value = 0;
}
+ /* OK, we found the spot, now let's advance until to an entry
+ * that is actually different from what we were previously
+ * looking at. This is necessary to handle entries which exist
+ * in two (or more) journal files, and which shall all be
+ * suppressed but one. */
+
for (;;) {
bool found;
k = compare_with_location(f, c, &j->current_location);
if (direction == DIRECTION_DOWN)
- found = k >= compare_value;
+ found = k > 0;
else
- found = k <= -compare_value;
+ found = k < 0;
} else
found = true;
uint64_t new_offset = 0;
Object *new_entry = NULL;
- assert(j);
+ if (!j)
+ return -EINVAL;
HASHMAP_FOREACH(f, j->files, i) {
Object *o;
bool found;
r = next_beyond_location(j, f, direction, &o, &p);
- if (r < 0)
- return r;
- else if (r == 0)
+ if (r < 0) {
+ log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r));
+ continue;
+ } else if (r == 0)
continue;
if (!new_current)
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);
-
- while (skip > 0) {
- r = sd_journal_next(j);
- if (r < 0)
- return r;
+ if (!j)
+ return -EINVAL;
- if (r == 0)
- return c;
+ 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);
- skip--;
- c++;
+ return 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);
+ do {
+ r = real_journal_next(j, direction);
if (r < 0)
return r;
skip--;
c++;
- }
+ } while (skip > 0);
- return 1;
+ return c;
+}
+
+_public_ int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
+ return real_journal_next_skip(j, DIRECTION_DOWN, skip);
}
-int sd_journal_get_cursor(sd_journal *j, char **cursor) {
+_public_ int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
+ return real_journal_next_skip(j, DIRECTION_UP, skip);
+}
+
+_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;
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)
+ path_get_file_name(j->current_file->path)) < 0)
return -ENOMEM;
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;
return 0;
}
-static int add_file(sd_journal *j, const char *prefix, const char *dir, const char *filename) {
- char *fn;
+static int add_file(sd_journal *j, const char *prefix, const char *filename) {
+ char *path;
int r;
JournalFile *f;
assert(prefix);
assert(filename);
- if (dir)
- fn = join(prefix, "/", dir, "/", filename, NULL);
- else
- fn = join(prefix, "/", filename, NULL);
+ if ((j->flags & SD_JOURNAL_SYSTEM_ONLY) &&
+ !(streq(filename, "system.journal") ||
+ streq(filename, "system.journal~") ||
+ (startswith(filename, "system@") &&
+ (endswith(filename, ".journal") || endswith(filename, ".journal~")))))
+ return 0;
- if (!fn)
+ path = strjoin(prefix, "/", filename, NULL);
+ if (!path)
return -ENOMEM;
- if (hashmap_get(j->files, fn)) {
- free(fn);
+ if (hashmap_get(j->files, path)) {
+ free(path);
return 0;
}
if (hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
- log_debug("Too many open journal files, not adding %s, ignoring.", fn);
- free(fn);
+ log_debug("Too many open journal files, not adding %s, ignoring.", path);
+ free(path);
return 0;
}
- r = journal_file_open(fn, O_RDONLY, 0, NULL, &f);
- free(fn);
+ r = journal_file_open(path, O_RDONLY, 0, NULL, NULL, &f);
+ free(path);
if (r < 0) {
if (errno == ENOENT)
return r;
}
- journal_file_dump(f);
+ /* journal_file_dump(f); */
r = hashmap_put(j->files, f->path, f);
if (r < 0) {
return r;
}
+ j->current_invalidate_counter ++;
+
log_debug("File %s got added.", f->path);
return 0;
}
-static int remove_file(sd_journal *j, const char *prefix, const char *dir, const char *filename) {
- char *fn;
+static int remove_file(sd_journal *j, const char *prefix, const char *filename) {
+ char *path;
JournalFile *f;
assert(j);
assert(prefix);
assert(filename);
- if (dir)
- fn = join(prefix, "/", dir, "/", filename, NULL);
- else
- fn = join(prefix, "/", filename, NULL);
-
- if (!fn)
+ path = strjoin(prefix, "/", filename, NULL);
+ if (!path)
return -ENOMEM;
- f = hashmap_get(j->files, fn);
- free(fn);
-
+ f = hashmap_get(j->files, path);
+ free(path);
if (!f)
return 0;
hashmap_remove(j->files, f->path);
journal_file_close(f);
+ j->current_invalidate_counter ++;
+
log_debug("File %s got removed.", f->path);
return 0;
}
-static int add_directory(sd_journal *j, const char *prefix, const char *dir) {
- char *fn;
+static int add_directory(sd_journal *j, const char *prefix, const char *dirname) {
+ char *path;
int r;
DIR *d;
- int wd;
+ sd_id128_t id, mid;
+ Directory *m;
assert(j);
assert(prefix);
- assert(dir);
+ assert(dirname);
- fn = join(prefix, "/", dir, NULL);
- if (!fn)
- return -ENOMEM;
+ if ((j->flags & SD_JOURNAL_LOCAL_ONLY) &&
+ (sd_id128_from_string(dirname, &id) < 0 ||
+ sd_id128_get_machine(&mid) < 0 ||
+ !sd_id128_equal(id, mid)))
+ return 0;
- d = opendir(fn);
+ path = strjoin(prefix, "/", dirname, NULL);
+ if (!path)
+ return -ENOMEM;
+ d = opendir(path);
if (!d) {
- free(fn);
+ log_debug("Failed to open %s: %m", path);
+ free(path);
+
if (errno == ENOENT)
return 0;
-
return -errno;
}
- wd = inotify_add_watch(j->inotify_fd, fn,
- IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
- IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT|
- IN_DONT_FOLLOW|IN_ONLYDIR);
- if (wd > 0) {
- if (hashmap_put(j->inotify_wd_dirs, INT_TO_PTR(wd), fn) < 0)
- inotify_rm_watch(j->inotify_fd, wd);
- else
- fn = NULL;
- }
+ m = hashmap_get(j->directories_by_path, path);
+ if (!m) {
+ m = new0(Directory, 1);
+ if (!m) {
+ closedir(d);
+ free(path);
+ return -ENOMEM;
+ }
+
+ m->is_root = false;
+ m->path = path;
+
+ if (hashmap_put(j->directories_by_path, m->path, m) < 0) {
+ closedir(d);
+ free(m->path);
+ free(m);
+ return -ENOMEM;
+ }
+
+ j->current_invalidate_counter ++;
+
+ log_debug("Directory %s got added.", m->path);
+
+ } else if (m->is_root) {
+ free (path);
+ closedir(d);
+ return 0;
+ } else
+ free(path);
+
+ if (m->wd <= 0 && j->inotify_fd >= 0) {
+
+ m->wd = inotify_add_watch(j->inotify_fd, m->path,
+ IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
+ IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT|
+ IN_ONLYDIR);
- free(fn);
+ if (m->wd > 0 && hashmap_put(j->directories_by_wd, INT_TO_PTR(m->wd), m) < 0)
+ inotify_rm_watch(j->inotify_fd, m->wd);
+ }
for (;;) {
struct dirent buf, *de;
if (r != 0 || !de)
break;
- if (!dirent_is_file_with_suffix(de, ".journal"))
- continue;
-
- r = add_file(j, prefix, dir, de->d_name);
- if (r < 0)
- log_debug("Failed to add file %s/%s/%s: %s", prefix, dir, de->d_name, strerror(-r));
+ if (dirent_is_file_with_suffix(de, ".journal") ||
+ dirent_is_file_with_suffix(de, ".journal~")) {
+ r = add_file(j, m->path, de->d_name);
+ if (r < 0)
+ log_debug("Failed to add file %s/%s: %s", m->path, de->d_name, strerror(-r));
+ }
}
closedir(d);
- log_debug("Directory %s/%s got added.", prefix, dir);
-
return 0;
}
-static void remove_directory_wd(sd_journal *j, int wd) {
- char *p;
+static int add_root_directory(sd_journal *j, const char *p) {
+ DIR *d;
+ Directory *m;
+ int r;
assert(j);
- assert(wd > 0);
+ assert(p);
- if (j->inotify_fd >= 0)
- inotify_rm_watch(j->inotify_fd, wd);
+ if ((j->flags & SD_JOURNAL_RUNTIME_ONLY) &&
+ !path_startswith(p, "/run"))
+ return -EINVAL;
- p = hashmap_remove(j->inotify_wd_dirs, INT_TO_PTR(wd));
+ d = opendir(p);
+ if (!d)
+ return -errno;
- if (p) {
- log_debug("Directory %s got removed.", p);
- free(p);
+ m = hashmap_get(j->directories_by_path, p);
+ if (!m) {
+ m = new0(Directory, 1);
+ if (!m) {
+ closedir(d);
+ return -ENOMEM;
+ }
+
+ m->is_root = true;
+ m->path = strdup(p);
+ if (!m->path) {
+ closedir(d);
+ free(m);
+ return -ENOMEM;
+ }
+
+ if (hashmap_put(j->directories_by_path, m->path, m) < 0) {
+ closedir(d);
+ free(m->path);
+ free(m);
+ return -ENOMEM;
+ }
+
+ j->current_invalidate_counter ++;
+
+ log_debug("Root directory %s got added.", m->path);
+
+ } else if (!m->is_root) {
+ closedir(d);
+ return 0;
}
-}
-static void add_root_wd(sd_journal *j, const char *p) {
- int wd;
- char *k;
+ if (m->wd <= 0 && j->inotify_fd >= 0) {
- assert(j);
- assert(p);
+ m->wd = inotify_add_watch(j->inotify_fd, m->path,
+ IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
+ IN_ONLYDIR);
- wd = inotify_add_watch(j->inotify_fd, p,
- IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
- IN_DONT_FOLLOW|IN_ONLYDIR);
- if (wd <= 0)
- return;
+ if (m->wd > 0 && hashmap_put(j->directories_by_wd, INT_TO_PTR(m->wd), m) < 0)
+ inotify_rm_watch(j->inotify_fd, m->wd);
+ }
+
+ for (;;) {
+ struct dirent buf, *de;
+ sd_id128_t id;
+
+ r = readdir_r(d, &buf, &de);
+ if (r != 0 || !de)
+ break;
+
+ if (dirent_is_file_with_suffix(de, ".journal") ||
+ dirent_is_file_with_suffix(de, ".journal~")) {
+ r = add_file(j, m->path, de->d_name);
+ if (r < 0)
+ log_debug("Failed to add file %s/%s: %s", m->path, de->d_name, strerror(-r));
- k = strdup(p);
- if (!k || hashmap_put(j->inotify_wd_roots, INT_TO_PTR(wd), k) < 0) {
- inotify_rm_watch(j->inotify_fd, wd);
- free(k);
+ } else if ((de->d_type == DT_DIR || de->d_type == DT_LNK || de->d_type == DT_UNKNOWN) &&
+ sd_id128_from_string(de->d_name, &id) >= 0) {
+
+ r = add_directory(j, m->path, de->d_name);
+ if (r < 0)
+ log_debug("Failed to add directory %s/%s: %s", m->path, de->d_name, strerror(-r));
+ }
}
-}
-static void remove_root_wd(sd_journal *j, int wd) {
- char *p;
+ closedir(d);
- assert(j);
- assert(wd > 0);
+ return 0;
+}
- if (j->inotify_fd >= 0)
- inotify_rm_watch(j->inotify_fd, wd);
+static int remove_directory(sd_journal *j, Directory *d) {
+ assert(j);
- p = hashmap_remove(j->inotify_wd_roots, INT_TO_PTR(wd));
+ if (d->wd > 0) {
+ hashmap_remove(j->directories_by_wd, INT_TO_PTR(d->wd));
- if (p) {
- log_debug("Root %s got removed.", p);
- free(p);
+ if (j->inotify_fd >= 0)
+ inotify_rm_watch(j->inotify_fd, d->wd);
}
+
+ hashmap_remove(j->directories_by_path, d->path);
+
+ if (d->is_root)
+ log_debug("Root directory %s got removed.", d->path);
+ else
+ log_debug("Directory %s got removed.", d->path);
+
+ free(d->path);
+ free(d);
+
+ return 0;
}
-int sd_journal_open(sd_journal **ret) {
- sd_journal *j;
- const char *p;
+static int add_search_paths(sd_journal *j) {
+
const char search_paths[] =
"/run/log/journal\0"
"/var/log/journal\0";
- int r;
+ const char *p;
- assert(ret);
+ assert(j);
- j = new0(sd_journal, 1);
- if (!j)
- return -ENOMEM;
+ /* We ignore most errors here, since the idea is to only open
+ * what's actually accessible, and ignore the rest. */
+
+ NULSTR_FOREACH(p, search_paths)
+ add_root_directory(j, p);
+
+ return 0;
+}
+
+static int allocate_inotify(sd_journal *j) {
+ assert(j);
- j->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
if (j->inotify_fd < 0) {
- r = -errno;
- goto fail;
+ j->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
+ if (j->inotify_fd < 0)
+ return -errno;
}
- j->files = hashmap_new(string_hash_func, string_compare_func);
- if (!j->files) {
- r = -ENOMEM;
- goto fail;
+ if (!j->directories_by_wd) {
+ j->directories_by_wd = hashmap_new(trivial_hash_func, trivial_compare_func);
+ if (!j->directories_by_wd)
+ return -ENOMEM;
}
- j->inotify_wd_dirs = hashmap_new(trivial_hash_func, trivial_compare_func);
- j->inotify_wd_roots = hashmap_new(trivial_hash_func, trivial_compare_func);
+ return 0;
+}
- if (!j->inotify_wd_dirs || !j->inotify_wd_roots) {
- r = -ENOMEM;
- goto fail;
- }
+static sd_journal *journal_new(int flags, const char *path) {
+ sd_journal *j;
- /* We ignore most errors here, since the idea is to only open
- * what's actually accessible, and ignore the rest. */
+ j = new0(sd_journal, 1);
+ if (!j)
+ return NULL;
- NULSTR_FOREACH(p, search_paths) {
- DIR *d;
+ j->inotify_fd = -1;
+ j->flags = flags;
- d = opendir(p);
- if (!d) {
- if (errno != ENOENT)
- log_debug("Failed to open %s: %m", p);
- continue;
+ if (path) {
+ j->path = strdup(path);
+ if (!j->path) {
+ free(j);
+ return NULL;
}
+ }
- add_root_wd(j, p);
+ j->files = hashmap_new(string_hash_func, string_compare_func);
+ if (!j->files) {
+ free(j->path);
+ free(j);
+ return NULL;
+ }
- for (;;) {
- struct dirent buf, *de;
- sd_id128_t id;
+ j->directories_by_path = hashmap_new(string_hash_func, string_compare_func);
+ if (!j->directories_by_path) {
+ hashmap_free(j->files);
+ free(j->path);
+ free(j);
+ return NULL;
+ }
- r = readdir_r(d, &buf, &de);
- if (r != 0 || !de)
- break;
+ return j;
+}
- 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));
+_public_ int sd_journal_open(sd_journal **ret, int flags) {
+ sd_journal *j;
+ int r;
- } else if ((de->d_type == DT_DIR || de->d_type == DT_UNKNOWN) &&
- sd_id128_from_string(de->d_name, &id) >= 0) {
+ if (!ret)
+ return -EINVAL;
- 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));
- }
- }
+ if (flags & ~(SD_JOURNAL_LOCAL_ONLY|
+ SD_JOURNAL_RUNTIME_ONLY|
+ SD_JOURNAL_SYSTEM_ONLY))
+ return -EINVAL;
- closedir(d);
- }
+ j = journal_new(flags, NULL);
+ if (!j)
+ return -ENOMEM;
+
+ r = add_search_paths(j);
+ if (r < 0)
+ goto fail;
*ret = j;
return 0;
sd_journal_close(j);
return r;
-};
+}
-void sd_journal_close(sd_journal *j) {
- assert(j);
+_public_ int sd_journal_open_directory(sd_journal **ret, const char *path, int flags) {
+ sd_journal *j;
+ int r;
- if (j->inotify_wd_dirs) {
- void *k;
+ if (!ret)
+ return -EINVAL;
- while ((k = hashmap_first_key(j->inotify_wd_dirs)))
- remove_directory_wd(j, PTR_TO_INT(k));
+ if (!path || !path_is_absolute(path))
+ return -EINVAL;
- hashmap_free(j->inotify_wd_dirs);
- }
+ if (flags != 0)
+ return -EINVAL;
+
+ j = journal_new(flags, path);
+ if (!j)
+ return -ENOMEM;
- if (j->inotify_wd_roots) {
- void *k;
+ r = add_root_directory(j, path);
+ if (r < 0)
+ goto fail;
- while ((k = hashmap_first_key(j->inotify_wd_roots)))
- remove_root_wd(j, PTR_TO_INT(k));
+ *ret = j;
+ return 0;
- hashmap_free(j->inotify_wd_roots);
- }
+fail:
+ sd_journal_close(j);
- if (j->files) {
- JournalFile *f;
+ return r;
+}
- while ((f = hashmap_steal_first(j->files)))
- journal_file_close(f);
+_public_ void sd_journal_close(sd_journal *j) {
+ Directory *d;
+ JournalFile *f;
- hashmap_free(j->files);
- }
+ if (!j)
+ return;
- sd_journal_flush_matches(j);
+ while ((f = hashmap_steal_first(j->files)))
+ journal_file_close(f);
+
+ hashmap_free(j->files);
+
+ while ((d = hashmap_first(j->directories_by_path)))
+ remove_directory(j, d);
+
+ while ((d = hashmap_first(j->directories_by_wd)))
+ remove_directory(j, d);
+
+ hashmap_free(j->directories_by_path);
+ hashmap_free(j->directories_by_wd);
if (j->inotify_fd >= 0)
close_nointr_nofail(j->inotify_fd);
+ sd_journal_flush_matches(j);
+
+ free(j->path);
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;
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);
+ if (ret)
+ *ret = le64toh(o->entry.monotonic);
+
return 0;
}
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
+static bool field_is_valid(const char *field) {
+ const char *p;
+
+ assert(field);
+
+ if (isempty(field))
+ return false;
+
+ if (startswith(field, "__"))
+ return false;
+
+ for (p = field; *p; p++) {
+
+ if (*p == '_')
+ continue;
+
+ if (*p >= 'A' && *p <= 'Z')
+ continue;
+
+ if (*p >= '0' && *p <= '9')
+ continue;
+
+ return false;
+ }
+
+ return true;
+}
+
+_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, '='))
+ if (!field_is_valid(field))
return -EINVAL;
f = j->current_file;
n = journal_file_entry_n_items(o);
for (i = 0; i < n; i++) {
- uint64_t p, l, le_hash;
+ uint64_t p, l;
+ le64_t le_hash;
size_t t;
p = le64toh(o->entry.items[i].object_offset);
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;
+ uint64_t p, l, n;
+ le64_t 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)
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) {
+ int r;
+
+ if (!j)
+ return -EINVAL;
+
+ if (j->inotify_fd >= 0)
+ return j->inotify_fd;
+
+ r = allocate_inotify(j);
+ if (r < 0)
+ return r;
+
+ /* Iterate through all dirs again, to add them to the
+ * inotify */
+ if (j->path)
+ r = add_root_directory(j, j->path);
+ else
+ r = add_search_paths(j);
+ if (r < 0)
+ return r;
return j->inotify_fd;
}
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
- char *p;
+ Directory *d;
int r;
assert(j);
assert(e);
/* Is this a subdirectory we watch? */
- p = hashmap_get(j->inotify_wd_dirs, INT_TO_PTR(e->wd));
- if (p) {
+ d = hashmap_get(j->directories_by_wd, INT_TO_PTR(e->wd));
+ if (d) {
+ sd_id128_t id;
- if (!(e->mask & IN_ISDIR) && e->len > 0 && endswith(e->name, ".journal")) {
+ if (!(e->mask & IN_ISDIR) && e->len > 0 &&
+ (endswith(e->name, ".journal") ||
+ endswith(e->name, ".journal~"))) {
/* Event for a journal file */
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
- r = add_file(j, p, NULL, e->name);
+ r = add_file(j, d->path, e->name);
if (r < 0)
- log_debug("Failed to add file %s/%s: %s", p, e->name, strerror(-r));
+ log_debug("Failed to add file %s/%s: %s", d->path, e->name, strerror(-r));
+
} else if (e->mask & (IN_DELETE|IN_UNMOUNT)) {
- r = remove_file(j, p, NULL, e->name);
+ r = remove_file(j, d->path, e->name);
if (r < 0)
- log_debug("Failed to remove file %s/%s: %s", p, e->name, strerror(-r));
+ log_debug("Failed to remove file %s/%s: %s", d->path, e->name, strerror(-r));
}
- } else if (e->len == 0) {
-
- /* Event for the directory itself */
-
- if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT))
- remove_directory_wd(j, e->wd);
- }
-
- return;
- }
-
- /* Must be the root directory then? */
- p = hashmap_get(j->inotify_wd_roots, INT_TO_PTR(e->wd));
- if (p) {
- sd_id128_t id;
-
- if (!(e->mask & IN_ISDIR) && e->len > 0 && endswith(e->name, ".journal")) {
+ } else if (!d->is_root && e->len == 0) {
- /* Event for a journal file */
-
- if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
- r = add_file(j, p, NULL, e->name);
- if (r < 0)
- log_debug("Failed to add file %s/%s: %s", p, e->name, strerror(-r));
- } else if (e->mask & (IN_DELETE|IN_UNMOUNT)) {
+ /* Event for a subdirectory */
- r = remove_file(j, p, NULL, e->name);
+ if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT)) {
+ r = remove_directory(j, d);
if (r < 0)
- log_debug("Failed to remove file %s/%s: %s", p, e->name, strerror(-r));
+ log_debug("Failed to remove directory %s: %s", d->path, strerror(-r));
}
- } else if ((e->mask & IN_ISDIR) && e->len > 0 && sd_id128_from_string(e->name, &id) >= 0) {
- /* Event for subdirectory */
+ } else if (d->is_root && (e->mask & IN_ISDIR) && e->len > 0 && sd_id128_from_string(e->name, &id) >= 0) {
- if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
+ /* Event for root directory */
- r = add_directory(j, p, e->name);
+ if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
+ r = add_directory(j, d->path, e->name);
if (r < 0)
- log_debug("Failed to add directory %s/%s: %s", p, e->name, strerror(-r));
+ log_debug("Failed to add directory %s/%s: %s", d->path, e->name, strerror(-r));
}
}
log_warning("Unknown inotify event.");
}
-int sd_journal_process(sd_journal *j) {
- uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX];
+static int determine_change(sd_journal *j) {
+ bool b;
assert(j);
+ b = j->current_invalidate_counter != j->last_invalidate_counter;
+ j->last_invalidate_counter = j->current_invalidate_counter;
+
+ return b ? SD_JOURNAL_INVALIDATE : SD_JOURNAL_APPEND;
+}
+
+_public_ int sd_journal_process(sd_journal *j) {
+ uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX] _alignas_(struct inotify_event);
+ bool got_something = false;
+
+ if (!j)
+ return -EINVAL;
+
for (;;) {
struct inotify_event *e;
ssize_t l;
l = read(j->inotify_fd, buffer, sizeof(buffer));
if (l < 0) {
- if (errno == EINTR || errno == EAGAIN)
- return 0;
+ if (errno == EAGAIN || errno == EINTR)
+ return got_something ? determine_change(j) : SD_JOURNAL_NOP;
return -errno;
}
+ got_something = true;
+
e = (struct inotify_event*) buffer;
while (l > 0) {
size_t step;
l -= step;
}
}
+
+ return determine_change(j);
+}
+
+_public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) {
+ int r;
+
+ assert(j);
+
+ if (j->inotify_fd < 0) {
+
+ /* This is the first invocation, hence create the
+ * inotify watch */
+ r = sd_journal_get_fd(j);
+ if (r < 0)
+ return r;
+
+ /* The journal might have changed since the context
+ * object was created and we weren't watching before,
+ * hence don't wait for anything, and return
+ * immediately. */
+ return determine_change(j);
+ }
+
+ do {
+ r = fd_wait_for_event(j->inotify_fd, POLLIN, timeout_usec);
+ } while (r == -EINTR);
+
+ if (r < 0)
+ return r;
+
+ return sd_journal_process(j);
+}
+
+_public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from, uint64_t *to) {
+ Iterator i;
+ JournalFile *f;
+ bool first = true;
+ int r;
+
+ if (!j)
+ return -EINVAL;
+ if (!from && !to)
+ return -EINVAL;
+
+ HASHMAP_FOREACH(f, j->files, i) {
+ usec_t fr, t;
+
+ r = journal_file_get_cutoff_realtime_usec(f, &fr, &t);
+ if (r == -ENOENT)
+ continue;
+ if (r < 0)
+ return r;
+ if (r == 0)
+ continue;
+
+ if (first) {
+ if (from)
+ *from = fr;
+ if (to)
+ *to = t;
+ first = false;
+ } else {
+ if (from)
+ *from = MIN(fr, *from);
+ if (to)
+ *to = MIN(t, *to);
+ }
+ }
+
+ return first ? 0 : 1;
}
+
+_public_ int sd_journal_get_cutoff_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t *from, uint64_t *to) {
+ Iterator i;
+ JournalFile *f;
+ bool first = true;
+ int r;
+
+ if (!j)
+ return -EINVAL;
+ if (!from && !to)
+ return -EINVAL;
+
+ HASHMAP_FOREACH(f, j->files, i) {
+ usec_t fr, t;
+
+ r = journal_file_get_cutoff_monotonic_usec(f, boot_id, &fr, &t);
+ if (r == -ENOENT)
+ continue;
+ if (r < 0)
+ return r;
+ if (r == 0)
+ continue;
+
+ if (first) {
+ if (from)
+ *from = fr;
+ if (to)
+ *to = t;
+ first = false;
+ } else {
+ if (from)
+ *from = MIN(fr, *from);
+ if (to)
+ *to = MIN(t, *to);
+ }
+ }
+
+ return first ? 0 : 1;
+}
+
+void journal_print_header(sd_journal *j) {
+ Iterator i;
+ JournalFile *f;
+ bool newline = false;
+
+ assert(j);
+
+ HASHMAP_FOREACH(f, j->files, i) {
+ if (newline)
+ putchar('\n');
+ else
+ newline = true;
+
+ journal_file_print_header(f);
+ }
+}
+
+/* _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