X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.h;h=4d6e1407711bad50df1d7896f88c0399cbd8df24;hb=e7bf07b3d444dddf67503df56acfbdbbe3e5261a;hp=ab2970ca007231cd1c86b20c99f835ea562bba0e;hpb=cf244689e9d1ab50082c9ddd0f3c4d1eb982badc;p=elogind.git

diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index ab2970ca0..4d6e14077 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -24,14 +24,10 @@
 
 #include <inttypes.h>
 
+#include <systemd/sd-id128.h>
+
 #include "journal-def.h"
 #include "util.h"
-#include "sd-id128.h"
-
-#define DEFAULT_MAX_SIZE (1024ULL*128ULL)
-#define DEFAULT_MIN_SIZE (256ULL*1024ULL)
-#define DEFAULT_KEEP_FREE (1ULL*1024ULL*1024ULL)
-#define DEFAULT_MAX_USE (16ULL*1024ULL*1024ULL*16ULL)
 
 typedef struct Window {
         void *ptr;
@@ -51,6 +47,7 @@ enum {
 };
 
 typedef struct JournalMetrics {
+        uint64_t max_use;
         uint64_t max_size;
         uint64_t min_size;
         uint64_t keep_free;
@@ -80,7 +77,7 @@ typedef struct JournalFile {
 
 #ifdef HAVE_XZ
         void *compress_buffer;
-        size_t compress_buffer_size;
+        uint64_t compress_buffer_size;
 #endif
 } JournalFile;
 
@@ -92,6 +89,8 @@ typedef enum direction {
 int journal_file_open(const char *fname, int flags, mode_t mode, JournalFile *template, JournalFile **ret);
 void journal_file_close(JournalFile *j);
 
+int journal_file_open_reliably(const char *fname, int flags, mode_t mode, JournalFile *template, JournalFile **ret);
+
 int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret);
 
 uint64_t journal_file_entry_n_items(Object *o);
@@ -123,4 +122,6 @@ int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t m
 
 void journal_file_post_change(JournalFile *f);
 
+void journal_default_metrics(JournalMetrics *m, int fd);
+
 #endif