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=e99050cdf27a65405d3da184f4dec773de985670;hp=ff8b34a951e76e701d3f2fd22975bdf26ad1b58d;hb=99cc7653a83af6647f28ac0cbedf6f6062e92b72;hpb=dfb33a9737e62ab872d3937b7690b252d2892fe8

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index ff8b34a95..e99050cdf 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <systemd/sd-id128.h>
+#include "systemd/sd-id128.h"
 
 #include "journal-def.h"
 #include "list.h"
@@ -57,36 +57,23 @@ struct Match {
         LIST_HEAD(Match, matches);
 };
 
-typedef enum LocationType {
-        /* The first and last entries, resp. */
-        LOCATION_HEAD,
-        LOCATION_TAIL,
-
-        /* 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 {
@@ -96,11 +83,10 @@ struct Directory {
 };
 
 struct sd_journal {
-        int flags;
-
         char *path;
+        char *prefix;
 
-        Hashmap *files;
+        OrderedHashmap *files;
         MMapCache *mmap;
 
         Location current_location;
@@ -108,33 +94,40 @@ struct sd_journal {
         JournalFile *current_file;
         uint64_t current_field;
 
-        Hashmap *directories_by_path;
-        Hashmap *directories_by_wd;
-
-        int inotify_fd;
+        Match *level0, *level1, *level2;
 
-        Match *level0, *level1;
+        pid_t original_pid;
 
+        int inotify_fd;
         unsigned current_invalidate_counter, last_invalidate_counter;
+        usec_t last_process_usec;
 
         char *unique_field;
         JournalFile *unique_file;
         uint64_t unique_offset;
 
+        int flags;
+
         bool on_network;
+        bool no_new_files;
+        bool unique_file_lost; /* File we were iterating over got
+                                  removed, and there were no more
+                                  files, so sd_j_enumerate_unique
+                                  will return a value equal to 0. */
 
         size_t data_threshold;
 
-        Set *errors;
+        Hashmap *directories_by_path;
+        Hashmap *directories_by_wd;
 
-        usec_t last_process_usec;
+        Set *errors;
 };
 
 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_TRIVIAL_CLEANUP_FUNC(sd_journal*, sd_journal_close);
+#define _cleanup_journal_close_ _cleanup_(sd_journal_closep)
 
-#define _cleanup_journal_close_ _cleanup_(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; )