#include "replace-var.h"
#include "fileio.h"
-#define JOURNAL_FILES_MAX 1024
+#define JOURNAL_FILES_MAX 7168
#define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
detach_location(j);
}
-_pure_ static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
- uint64_t a;
-
- assert(af);
- assert(ao);
+_pure_ static int compare_with_location(JournalFile *f, Location *l) {
+ assert(f);
assert(l);
+ assert(f->location_type == LOCATION_SEEK);
assert(l->type == LOCATION_DISCRETE || l->type == LOCATION_SEEK);
if (l->monotonic_set &&
- sd_id128_equal(ao->entry.boot_id, l->boot_id) &&
+ sd_id128_equal(f->current_boot_id, l->boot_id) &&
l->realtime_set &&
- le64toh(ao->entry.realtime) == l->realtime &&
+ f->current_realtime == l->realtime &&
l->xor_hash_set &&
- le64toh(ao->entry.xor_hash) == l->xor_hash)
+ f->current_xor_hash == l->xor_hash)
return 0;
if (l->seqnum_set &&
- sd_id128_equal(af->header->seqnum_id, l->seqnum_id)) {
-
- a = le64toh(ao->entry.seqnum);
+ sd_id128_equal(f->header->seqnum_id, l->seqnum_id)) {
- if (a < l->seqnum)
+ if (f->current_seqnum < l->seqnum)
return -1;
- if (a > l->seqnum)
+ if (f->current_seqnum > l->seqnum)
return 1;
}
if (l->monotonic_set &&
- sd_id128_equal(ao->entry.boot_id, l->boot_id)) {
+ sd_id128_equal(f->current_boot_id, l->boot_id)) {
- a = le64toh(ao->entry.monotonic);
-
- if (a < l->monotonic)
+ if (f->current_monotonic < l->monotonic)
return -1;
- if (a > l->monotonic)
+ if (f->current_monotonic > l->monotonic)
return 1;
}
if (l->realtime_set) {
- a = le64toh(ao->entry.realtime);
-
- if (a < l->realtime)
+ if (f->current_realtime < l->realtime)
return -1;
- if (a > l->realtime)
+ if (f->current_realtime > l->realtime)
return 1;
}
if (l->xor_hash_set) {
- a = le64toh(ao->entry.xor_hash);
- if (a < l->xor_hash)
+ if (f->current_xor_hash < l->xor_hash)
return -1;
- if (a > l->xor_hash)
+ if (f->current_xor_hash > l->xor_hash)
return 1;
}
Object **ret,
uint64_t *offset) {
- uint64_t cp;
-
assert(j);
assert(f);
assert(ret);
assert(offset);
- cp = *offset;
-
/* No matches is easy. We simple advance the file
* pointer by one. */
if (!j->level0)
- return journal_file_next_entry(f, cp, direction, ret, offset);
+ return journal_file_next_entry(f, f->current_offset, 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);
+ return next_for_match(j, j->level0, f,
+ direction == DIRECTION_DOWN ? f->current_offset + 1
+ : f->current_offset - 1,
+ direction, ret, offset);
}
static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction) {
assert(j);
assert(f);
- /* If we hit EOF before, recheck if any new entries arrived. */
- n_entries = le64toh(f->header->n_entries);
- if (f->location_type == LOCATION_TAIL && n_entries == f->last_n_entries)
- return 0;
- f->last_n_entries = n_entries;
-
if (f->last_direction == direction && f->current_offset > 0) {
+ /* If we hit EOF before, recheck if any new entries arrived. */
+ n_entries = le64toh(f->header->n_entries);
+ if (f->location_type == LOCATION_TAIL && n_entries == f->last_n_entries)
+ return 0;
+ f->last_n_entries = n_entries;
+
/* LOCATION_SEEK here means we did the work in a previous
* iteration and the current location already points to a
* candidate entry. */
- if (f->location_type == LOCATION_SEEK)
- return 1;
-
- cp = f->current_offset;
+ if (f->location_type != LOCATION_SEEK) {
+ r = next_with_matches(j, f, direction, &c, &cp);
+ if (r <= 0)
+ return r;
- r = next_with_matches(j, f, direction, &c, &cp);
- if (r <= 0)
- return r;
+ journal_file_save_location(f, direction, c, cp);
+ }
} else {
r = find_location_with_matches(j, f, direction, &c, &cp);
if (r <= 0)
return r;
+
+ journal_file_save_location(f, direction, c, cp);
}
/* OK, we found the spot, now let's advance until an entry
if (j->current_location.type == LOCATION_DISCRETE) {
int k;
- k = compare_with_location(f, c, &j->current_location);
+ k = compare_with_location(f, &j->current_location);
found = direction == DIRECTION_DOWN ? k > 0 : k < 0;
} else
found = true;
- if (found) {
- journal_file_save_location(f, direction, c, cp);
+ if (found)
return 1;
- }
r = next_with_matches(j, f, direction, &c, &cp);
if (r <= 0)
return r;
+
+ journal_file_save_location(f, direction, c, cp);
}
}
j->last_process_usec = now(CLOCK_MONOTONIC);
for (;;) {
- uint8_t buffer[INOTIFY_EVENT_MAX] _alignas_(struct inotify_event);
+ union inotify_event_buffer buffer;
struct inotify_event *e;
ssize_t l;
- l = read(j->inotify_fd, buffer, sizeof(buffer));
+ l = read(j->inotify_fd, &buffer, sizeof(buffer));
if (l < 0) {
if (errno == EAGAIN || errno == EINTR)
return got_something ? determine_change(j) : SD_JOURNAL_NOP;