X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.h;h=2526e14d650f3ab7cec8599d84b72e285bf8a9e0;hb=a2341f6836da0a217ab0c5f2b82f0c4ea13d429d;hp=21b0821b6b246fbb5cf98cb82a4cded6cc1f64b4;hpb=b8e891e699e1336c5527f8203e4e8f67c9bbeb84;p=elogind.git diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index 21b0821b6..2526e14d6 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -27,16 +27,17 @@ #include #endif -#include +#include "sd-id128.h" #include "sparse-endian.h" #include "journal-def.h" -#include "util.h" +#include "macro.h" #include "mmap-cache.h" #include "hashmap.h" typedef struct JournalMetrics { uint64_t max_use; + uint64_t use; uint64_t max_size; uint64_t min_size; uint64_t keep_free; @@ -47,6 +48,20 @@ typedef enum direction { DIRECTION_DOWN } direction_t; +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; + typedef struct JournalFile { int fd; @@ -55,30 +70,40 @@ typedef struct JournalFile { int flags; int prot; bool writable:1; - bool compress:1; + bool compress_xz:1; + bool compress_lz4:1; bool seal:1; + bool defrag_on_close:1; bool tail_entry_monotonic_valid:1; direction_t last_direction; + LocationType location_type; + uint64_t last_n_entries; char *path; struct stat last_stat; + usec_t last_stat_usec; Header *header; HashItem *data_hash_table; HashItem *field_hash_table; uint64_t current_offset; + uint64_t current_seqnum; + uint64_t current_realtime; + uint64_t current_monotonic; + sd_id128_t current_boot_id; + uint64_t current_xor_hash; JournalMetrics metrics; MMapCache *mmap; - Hashmap *chain_cache; + OrderedHashmap *chain_cache; -#ifdef HAVE_XZ +#if defined(HAVE_XZ) || defined(HAVE_LZ4) void *compress_buffer; - uint64_t compress_buffer_size; + size_t compress_buffer_size; #endif #ifdef HAVE_GCRYPT @@ -127,6 +152,10 @@ int journal_file_open_reliably( #define ALIGN64(x) (((x) + 7ULL) & ~7ULL) #define VALID64(x) (((x) & 7ULL) == 0ULL) +/* Use six characters to cover the offsets common in smallish journal + * files without adding too many zeros. */ +#define OFSfmt "%06"PRIx64 + static inline bool VALID_REALTIME(uint64_t u) { /* This considers timestamps until the year 3112 valid. That should be plenty room... */ return u > 0 && u < (1ULL << 55); @@ -148,16 +177,19 @@ static inline bool VALID_EPOCH(uint64_t u) { #define JOURNAL_HEADER_SEALED(h) \ (!!(le32toh((h)->compatible_flags) & HEADER_COMPATIBLE_SEALED)) -#define JOURNAL_HEADER_COMPRESSED(h) \ - (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED)) +#define JOURNAL_HEADER_COMPRESSED_XZ(h) \ + (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED_XZ)) + +#define JOURNAL_HEADER_COMPRESSED_LZ4(h) \ + (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED_LZ4)) -int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret); +int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret); uint64_t journal_file_entry_n_items(Object *o) _pure_; uint64_t journal_file_entry_array_n_items(Object *o) _pure_; uint64_t journal_file_hash_table_n_items(Object *o) _pure_; -int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset); +int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset); int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset); int journal_file_find_data_object(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset); @@ -166,12 +198,13 @@ int journal_file_find_data_object_with_hash(JournalFile *f, const void *data, ui int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t size, Object **ret, uint64_t *offset); int journal_file_find_field_object_with_hash(JournalFile *f, const void *field, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset); -int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, direction_t direction, Object **ret, uint64_t *offset); -int journal_file_skip_entry(JournalFile *f, Object *o, uint64_t p, int64_t skip, Object **ret, uint64_t *offset); +void journal_file_reset_location(JournalFile *f); +void journal_file_save_location(JournalFile *f, direction_t direction, Object *o, uint64_t offset); +int journal_file_compare_locations(JournalFile *af, JournalFile *bf); +int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset); int journal_file_next_entry_for_data(JournalFile *f, Object *o, uint64_t p, uint64_t data_offset, direction_t direction, Object **ret, uint64_t *offset); -int journal_file_move_to_entry_by_offset(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset); int journal_file_move_to_entry_by_seqnum(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset); int journal_file_move_to_entry_by_realtime(JournalFile *f, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset); int journal_file_move_to_entry_by_monotonic(JournalFile *f, sd_id128_t boot_id, uint64_t monotonic, direction_t direction, Object **ret, uint64_t *offset);