shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

Revert "journal: optimize iteration: skip files that cannot improve current candidate entry"

Browse Source 
This reverts commit f8b5a3b75fb55f0acb85c21424b3893c822742e9.

This optimization will be made redundant by the following patches.
This commit is contained in:
Michal Schmidt 2014-12-16 20:32:34 +01:00
parent 14499361a5
commit 0633cb5206
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/journal/sd-journal.c
View File

@ -517,27 +517,6 @@ static bool whole_file_precedes_location(JournalFile *f, Location *l, direction_
return false;
}
static bool file_may_have_preceding_entry(JournalFile *f, JournalFile *of, uint64_t op, direction_t direction) {
Object *o;
int r;
assert(f);
assert(of);
r = journal_file_move_to_object(of, OBJECT_ENTRY, op, &o);
if (r < 0)
return true;
if (sd_id128_equal(f->header->seqnum_id, of->header->seqnum_id))
return direction == DIRECTION_DOWN ?
le64toh(o->entry.seqnum) >= le64toh(f->header->head_entry_seqnum) :
le64toh(o->entry.seqnum) <= le64toh(f->header->tail_entry_seqnum);
return direction == DIRECTION_DOWN ?
le64toh(o->entry.realtime) >= le64toh(f->header->head_entry_realtime) :
le64toh(o->entry.realtime) <= le64toh(f->header->tail_entry_realtime);
}
_pure_ static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
uint64_t a;
@ -926,9 +905,6 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
if (whole_file_precedes_location(f, &j->current_location, direction))
continue;
if (new_file && !file_may_have_preceding_entry(f, new_file, new_offset, direction))
continue;
r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) {
log_debug_errno(r, "Can't iterate through %s, ignoring: %m", f->path);