X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-internal.h;h=c7e585d810d184fa8585006458f76fde0b03cc18;hb=53789059e0e9378041697c25af06a08a433fb964;hp=97de0e75ffba2356f8d5cfe339fd8cb8aa9239b5;hpb=93b73b064c663d6248bebfbbbd82989b5ca10fc5;p=elogind.git

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 97de0e75f..c7e585d81 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -30,6 +30,7 @@
 #include "journal-def.h"
 #include "list.h"
 #include "hashmap.h"
+#include "set.h"
 #include "journal-file.h"
 
 typedef struct Match Match;
@@ -73,19 +74,20 @@ typedef enum LocationType {
 struct Location {
         LocationType type;
 
+        bool seqnum_set;
+        bool realtime_set;
+        bool monotonic_set;
+        bool xor_hash_set;
+
         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;
 };
 
 struct Directory {
@@ -112,7 +114,7 @@ struct sd_journal {
 
         int inotify_fd;
 
-        Match *level0, *level1;
+        Match *level0, *level1, *level2;
 
         unsigned current_invalidate_counter, last_invalidate_counter;
 
@@ -123,7 +125,17 @@ struct sd_journal {
         bool on_network;
 
         size_t data_threshold;
+
+        Set *errors;
+
+        usec_t last_process_usec;
 };
 
 char *journal_make_match_string(sd_journal *j);
 void journal_print_header(sd_journal *j);
+
+static inline void journal_closep(sd_journal **j) {
+        sd_journal_close(*j);
+}
+
+#define _cleanup_journal_close_ _cleanup_(journal_closep)