chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel-install: avoid using 'cp --preserve'
[elogind.git]
/
src
/
journal
/
journal-internal.h
diff --git
a/src/journal/journal-internal.h
b/src/journal/journal-internal.h
index ff8b34a951e76e701d3f2fd22975bdf26ad1b58d..5bc653537c0a53c10570df8538904c955321813f 100644
(file)
--- a/
src/journal/journal-internal.h
+++ b/
src/journal/journal-internal.h
@@
-74,19
+74,20
@@
typedef enum LocationType {
struct Location {
LocationType type;
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;
uint64_t seqnum;
sd_id128_t seqnum_id;
- bool seqnum_set;
uint64_t realtime;
uint64_t realtime;
- bool realtime_set;
uint64_t monotonic;
sd_id128_t boot_id;
uint64_t monotonic;
sd_id128_t boot_id;
- bool monotonic_set;
uint64_t xor_hash;
uint64_t xor_hash;
- bool xor_hash_set;
};
struct Directory {
};
struct Directory {
@@
-96,8
+97,6
@@
struct Directory {
};
struct sd_journal {
};
struct sd_journal {
- int flags;
-
char *path;
Hashmap *files;
char *path;
Hashmap *files;
@@
-108,26
+107,29
@@
struct sd_journal {
JournalFile *current_file;
uint64_t current_field;
JournalFile *current_file;
uint64_t current_field;
- Hashmap *directories_by_path;
- Hashmap *directories_by_wd;
+ Match *level0, *level1, *level2;
- int inotify_fd;
-
- Match *level0, *level1;
+ pid_t original_pid;
+ int inotify_fd;
unsigned current_invalidate_counter, last_invalidate_counter;
unsigned current_invalidate_counter, last_invalidate_counter;
+ usec_t last_process_usec;
char *unique_field;
JournalFile *unique_file;
uint64_t unique_offset;
char *unique_field;
JournalFile *unique_file;
uint64_t unique_offset;
+ int flags;
+
bool on_network;
bool on_network;
+ bool no_new_files;
size_t data_threshold;
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);
};
char *journal_make_match_string(sd_journal *j);
@@
-138,3
+140,6
@@
static inline void journal_closep(sd_journal **j) {
}
#define _cleanup_journal_close_ _cleanup_(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; )