From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Jul 2012 17:28:05 +0000 (+0200)
Subject: journal: use tail/head timestamps from header for cutoff logic
X-Git-Tag: v187~60
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=162566a4a12c35e1e86e35ced1748354f7ec935e;ds=sidebyside

journal: use tail/head timestamps from header for cutoff logic

We have them, they are faster to use them, so use them...
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index cd5ab266f..a110a0090 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2446,26 +2446,21 @@ void journal_default_metrics(JournalMetrics *m, int fd) {
 }
 
 int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t *to) {
-        Object *o;
-        int r;
-
         assert(f);
         assert(from || to);
 
         if (from) {
-                r = journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, NULL);
-                if (r <= 0)
-                        return r;
+                if (f->header->head_entry_realtime == 0)
+                        return -ENOENT;
 
-                *from = le64toh(o->entry.realtime);
+                *from = le64toh(f->header->head_entry_realtime);
         }
 
         if (to) {
-                r = journal_file_next_entry(f, NULL, 0, DIRECTION_UP, &o, NULL);
-                if (r <= 0)
-                        return r;
+                if (f->header->tail_entry_realtime == 0)
+                        return -ENOENT;
 
-                *to = le64toh(o->entry.realtime);
+                *to = le64toh(f->header->tail_entry_realtime);
         }
 
         return 1;