X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-def.h;h=b30ae796836d6586222f4143d1d7660254ac0d9c;hb=4a010f4e6e95964d7acaa33be768dbdb5e46d72a;hp=2a519fe0dbf590f609a4336e61d9d162f805f320;hpb=dad503169b2665ecfd3f5bfb3c936897e44ecca7;p=elogind.git
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index 2a519fe0d..b30ae7968 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -9,31 +9,37 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
-#include
+#include "sparse-endian.h"
+
+#include
#include "macro.h"
-#include "sd-id128.h"
typedef struct Header Header;
+
typedef struct ObjectHeader ObjectHeader;
typedef union Object Object;
+
typedef struct DataObject DataObject;
+typedef struct FieldObject FieldObject;
typedef struct EntryObject EntryObject;
typedef struct HashTableObject HashTableObject;
-typedef struct BisectTableObject BisectTableObject;
+typedef struct EntryArrayObject EntryArrayObject;
+typedef struct SignatureObject SignatureObject;
+
typedef struct EntryItem EntryItem;
typedef struct HashItem HashItem;
@@ -41,66 +47,95 @@ typedef struct HashItem HashItem;
enum {
OBJECT_UNUSED,
OBJECT_DATA,
+ OBJECT_FIELD,
OBJECT_ENTRY,
- OBJECT_HASH_TABLE,
- OBJECT_BISECT_TABLE
+ OBJECT_DATA_HASH_TABLE,
+ OBJECT_FIELD_HASH_TABLE,
+ OBJECT_ENTRY_ARRAY,
+ OBJECT_SIGNATURE,
+ _OBJECT_TYPE_MAX
+};
+
+/* Object flags */
+enum {
+ OBJECT_COMPRESSED = 1
};
_packed_ struct ObjectHeader {
uint8_t type;
- uint8_t reserved[3];
- uint64_t size;
+ uint8_t flags;
+ uint8_t reserved[6];
+ le64_t size;
uint8_t payload[];
};
_packed_ struct DataObject {
ObjectHeader object;
- uint64_t hash;
- uint64_t head_entry_offset;
- uint64_t tail_entry_offset;
- uint64_t prev_hash_offset;
- uint64_t next_hash_offset;
+ le64_t hash;
+ le64_t next_hash_offset;
+ le64_t next_field_offset;
+ le64_t entry_offset; /* the first array entry we store inline */
+ le64_t entry_array_offset;
+ le64_t n_entries;
+ uint8_t payload[];
+};
+
+_packed_ struct FieldObject {
+ ObjectHeader object;
+ le64_t hash;
+ le64_t next_hash_offset;
+ le64_t head_data_offset;
+ le64_t tail_data_offset;
uint8_t payload[];
};
_packed_ struct EntryItem {
- uint64_t object_offset;
- uint64_t prev_entry_offset;
- uint64_t next_entry_offset;
+ le64_t object_offset;
+ le64_t hash;
};
_packed_ struct EntryObject {
ObjectHeader object;
- uint64_t seqnum;
- uint64_t realtime;
- uint64_t monotonic;
- uint64_t xor_hash;
- uint64_t prev_entry_offset;
- uint64_t next_entry_offset;
+ le64_t seqnum;
+ le64_t realtime;
+ le64_t monotonic;
+ sd_id128_t boot_id;
+ le64_t xor_hash;
EntryItem items[];
};
_packed_ struct HashItem {
- uint64_t head_hash_offset;
- uint64_t tail_hash_offset;
+ le64_t head_hash_offset;
+ le64_t tail_hash_offset;
};
_packed_ struct HashTableObject {
ObjectHeader object;
- HashItem table[];
+ HashItem items[];
};
-_packed_ struct BisectTableObject {
+_packed_ struct EntryArrayObject {
ObjectHeader object;
- uint64_t table[];
+ le64_t next_entry_array_offset;
+ le64_t items[];
+};
+
+#define SIGNATURE_LENGTH 160
+
+_packed_ struct SignatureObject {
+ ObjectHeader object;
+ le64_t from;
+ uint8_t signature[SIGNATURE_LENGTH];
};
union Object {
ObjectHeader object;
DataObject data;
+ FieldObject field;
EntryObject entry;
HashTableObject hash_table;
- BisectTableObject bisect_table;
+ EntryArrayObject entry_array;
+ SignatureObject signature;
};
enum {
@@ -109,32 +144,40 @@ enum {
STATE_ARCHIVED
};
+/* Header flags */
+enum {
+ HEADER_INCOMPATIBLE_COMPRESSED = 1
+};
+
+enum {
+ HEADER_COMPATIBLE_SIGNED = 1
+};
+
_packed_ struct Header {
uint8_t signature[8]; /* "LPKSHHRH" */
uint32_t compatible_flags;
uint32_t incompatible_flags;
- uint32_t state;
- uint8_t reserved[4];
+ uint8_t state;
+ uint8_t reserved[7];
sd_id128_t file_id;
- sd_id128_t machine_id;
- sd_id128_t boot_id;
- uint64_t arena_offset;
- uint64_t arena_size;
- uint64_t arena_max_size;
- uint64_t arena_min_size;
- uint64_t arena_keep_free;
- uint64_t hash_table_offset; /* for looking up data objects */
- uint64_t hash_table_size;
- uint64_t bisect_table_offset; /* for looking up entry objects */
- uint64_t bisect_table_size;
- uint64_t head_object_offset;
- uint64_t tail_object_offset;
- uint64_t head_entry_offset;
- uint64_t tail_entry_offset;
- uint64_t last_bisect_offset;
- uint64_t n_objects;
- uint64_t seqnum_base;
- uint64_t seqnum;
+ sd_id128_t machine_id; /* last writer */
+ sd_id128_t boot_id; /* last writer */
+ sd_id128_t seqnum_id;
+ le64_t header_size;
+ le64_t arena_size;
+ le64_t data_hash_table_offset; /* for looking up data objects */
+ le64_t data_hash_table_size;
+ le64_t field_hash_table_offset; /* for looking up field objects */
+ le64_t field_hash_table_size;
+ le64_t tail_object_offset;
+ le64_t n_objects;
+ le64_t n_entries;
+ le64_t seqnum;
+ le64_t first_seqnum;
+ le64_t entry_array_offset;
+ le64_t head_entry_realtime;
+ le64_t tail_entry_realtime;
+ le64_t tail_entry_monotonic;
};
#endif