X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-internal.h;h=97de0e75ffba2356f8d5cfe339fd8cb8aa9239b5;hb=641906e9366891e0ad3e6e38b7396a427678c4cf;hp=482ef61b9ab0410b3086c14d9443d0e20d7f76a5;hpb=cbdca8525b4f36297cb9e5cb090a9648763ed1bf;p=elogind.git

diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 482ef61b9..97de0e75f 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foojournalinternalhfoo
-#define foojournalinternalhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -33,9 +32,6 @@
 #include "hashmap.h"
 #include "journal-file.h"
 
-typedef enum MatchType MatchType;
-typedef enum LocationType LocationType;
-
 typedef struct Match Match;
 typedef struct Location Location;
 typedef struct Directory Directory;
@@ -61,9 +57,17 @@ 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 {
@@ -93,7 +97,10 @@ struct Directory {
 struct sd_journal {
         int flags;
 
+        char *path;
+
         Hashmap *files;
+        MMapCache *mmap;
 
         Location current_location;
 
@@ -108,8 +115,15 @@ struct sd_journal {
         Match *level0, *level1;
 
         unsigned current_invalidate_counter, last_invalidate_counter;
+
+        char *unique_field;
+        JournalFile *unique_file;
+        uint64_t unique_offset;
+
+        bool on_network;
+
+        size_t data_threshold;
 };
 
 char *journal_make_match_string(sd_journal *j);
-
-#endif
+void journal_print_header(sd_journal *j);