X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournal-internal.h;h=2c401e3083d0fde852b7bb482f31060d4951bf94;hp=86519be3d41f4286d4dc1161083a16835172dd9e;hb=8c4e25b73c680ce4072247592bd44e1c809e2dd2;hpb=16e9f408fa9a9626059bdd6c89dc175e06b9e976

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 86519be3d..2c401e308 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;
@@ -57,27 +58,36 @@ struct Match {
 };
 
 typedef enum LocationType {
+        /* The first and last entries, resp. */
         LOCATION_HEAD,
         LOCATION_TAIL,
-        LOCATION_DISCRETE
+
+        /* We already read the entry we currently point to, and the
+         * next one to read should probably not be this one again. */
+        LOCATION_DISCRETE,
+
+        /* We should seek to the precise location specified, and
+         * return it, as we haven't read it yet. */
+        LOCATION_SEEK
 } 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 {
@@ -87,9 +97,8 @@ struct Directory {
 };
 
 struct sd_journal {
-        int flags;
-
         char *path;
+        char *prefix;
 
         Hashmap *files;
         MMapCache *mmap;
@@ -99,15 +108,36 @@ struct sd_journal {
         JournalFile *current_file;
         uint64_t current_field;
 
-        Hashmap *directories_by_path;
-        Hashmap *directories_by_wd;
+        Match *level0, *level1, *level2;
+
+        pid_t original_pid;
 
         int inotify_fd;
+        unsigned current_invalidate_counter, last_invalidate_counter;
+        usec_t last_process_usec;
 
-        Match *level0, *level1;
+        char *unique_field;
+        JournalFile *unique_file;
+        uint64_t unique_offset;
 
-        unsigned current_invalidate_counter, last_invalidate_counter;
+        int flags;
+
+        bool on_network;
+        bool no_new_files;
+
+        size_t data_threshold;
+
+        Hashmap *directories_by_path;
+        Hashmap *directories_by_wd;
+
+        Set *errors;
 };
 
 char *journal_make_match_string(sd_journal *j);
 void journal_print_header(sd_journal *j);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(sd_journal*, sd_journal_close);
+#define _cleanup_journal_close_ _cleanup_(sd_journal_closep)
+
+#define JOURNAL_FOREACH_DATA_RETVAL(j, data, l, retval)                     \
+        for (sd_journal_restart_data(j); ((retval) = sd_journal_enumerate_data((j), &(data), &(l))) > 0; )