chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: make start jobs wait, not fail, when an automatic restart is queued
[elogind.git]
/
src
/
journal
/
journal-internal.h
diff --git
a/src/journal/journal-internal.h
b/src/journal/journal-internal.h
index bcffa35055ec664ce0a7f062ac46f79ef58787f6..b767901432e5f5c695250d1bed00fa6608a1c06b 100644
(file)
--- a/
src/journal/journal-internal.h
+++ b/
src/journal/journal-internal.h
@@
-28,26
+28,43
@@
#include <systemd/sd-id128.h>
#include <systemd/sd-id128.h>
+#include "journal-def.h"
#include "list.h"
#include "list.h"
+#include "hashmap.h"
+#include "journal-file.h"
typedef struct Match Match;
typedef struct Match Match;
+typedef struct Location Location;
+typedef struct Directory Directory;
+
+typedef enum MatchType {
+ MATCH_DISCRETE,
+ MATCH_OR_TERM,
+ MATCH_AND_TERM
+} MatchType;
struct Match {
struct Match {
+ MatchType type;
+ Match *parent;
+ LIST_FIELDS(Match, matches);
+
+ /* For concrete matches */
char *data;
size_t size;
le64_t le_hash;
char *data;
size_t size;
le64_t le_hash;
- LIST_FIELDS(Match, matches);
+ /* For terms */
+ LIST_HEAD(Match, matches);
};
};
-typedef enum
location_t
ype {
+typedef enum
LocationT
ype {
LOCATION_HEAD,
LOCATION_TAIL,
LOCATION_DISCRETE
LOCATION_HEAD,
LOCATION_TAIL,
LOCATION_DISCRETE
-}
location_type_t
;
+}
LocationType
;
-
typedef
struct Location {
-
location_type_t
type;
+struct Location {
+
LocationType
type;
uint64_t seqnum;
sd_id128_t seqnum_id;
uint64_t seqnum;
sd_id128_t seqnum_id;
@@
-62,7
+79,13
@@
typedef struct Location {
uint64_t xor_hash;
bool xor_hash_set;
uint64_t xor_hash;
bool xor_hash_set;
-} Location;
+};
+
+struct Directory {
+ char *path;
+ int wd;
+ bool is_root;
+};
struct sd_journal {
int flags;
struct sd_journal {
int flags;
@@
-70,15
+93,21
@@
struct sd_journal {
Hashmap *files;
Location current_location;
Hashmap *files;
Location current_location;
+
JournalFile *current_file;
uint64_t current_field;
JournalFile *current_file;
uint64_t current_field;
+ Hashmap *directories_by_path;
+ Hashmap *directories_by_wd;
+
int inotify_fd;
int inotify_fd;
- Hashmap *inotify_wd_dirs;
- Hashmap *inotify_wd_roots;
- LIST_HEAD(Match, matches);
- unsigned n_matches;
+ Match *level0, *level1;
+
+ unsigned current_invalidate_counter, last_invalidate_counter;
};
};
+char *journal_make_match_string(sd_journal *j);
+void journal_print_header(sd_journal *j);
+
#endif
#endif