picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "journal: optimize iteration: skip whole files behind current location"

Browse source 
This reverts commit b7c88ab8cc.

This optimization will be made redundant by the following patches.
This commit is contained in:
Michal Schmidt 2014-12-16 20:32:41 +01:00
parent 0633cb5206
commit 8a2bd0a365
1 changed files with 0 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/journal/sd-journal.c
View file

@ -497,26 +497,6 @@ static int compare_entry_order(JournalFile *af, Object *_ao,
return 0;
}
static bool whole_file_precedes_location(JournalFile *f, Location *l, direction_t direction) {
assert(f);
assert(l);
if (l->type != LOCATION_DISCRETE && l->type != LOCATION_SEEK)
return false;
if (l->seqnum_set && sd_id128_equal(l->seqnum_id, f->header->seqnum_id))
return direction == DIRECTION_DOWN ?
l->seqnum > le64toh(f->header->tail_entry_seqnum) :
l->seqnum < le64toh(f->header->head_entry_seqnum);
if (l->realtime_set)
return direction == DIRECTION_DOWN ?
l->realtime > le64toh(f->header->tail_entry_realtime) :
l->realtime < le64toh(f->header->head_entry_realtime);
return false;
}
_pure_ static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
uint64_t a;
@ -902,9 +882,6 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
ORDERED_HASHMAP_FOREACH(f, j->files, i) {
bool found;
if (whole_file_precedes_location(f, &j->current_location, 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);