chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: add networkd-wait-online
[elogind.git]
/
src
/
journal
/
journal-internal.h
diff --git
a/src/journal/journal-internal.h
b/src/journal/journal-internal.h
index c7e585d810d184fa8585006458f76fde0b03cc18..2c401e3083d0fde852b7bb482f31060d4951bf94 100644
(file)
--- a/
src/journal/journal-internal.h
+++ b/
src/journal/journal-internal.h
@@
-97,9
+97,8
@@
struct Directory {
};
struct sd_journal {
};
struct sd_journal {
- int flags;
-
char *path;
char *path;
+ char *prefix;
Hashmap *files;
MMapCache *mmap;
Hashmap *files;
MMapCache *mmap;
@@
-109,33
+108,36
@@
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;
-
- int inotify_fd;
-
Match *level0, *level1, *level2;
Match *level0, *level1, *level2;
+ 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);
void journal_print_header(sd_journal *j);
};
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; )