X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.h;h=aeb6d46c79c12b4d49fe69fd4d05da50bf25233a;hb=5430f7f2bc7330f3088b894166bf3524a067e3d8;hp=acc55272a05894778ce164d464f75cedb95550a3;hpb=74ef2d16ada74db3059d825ce8d24ea74946bf8f;p=elogind.git
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index acc55272a..aeb6d46c7 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -9,29 +9,26 @@
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
+
+#include "sparse-endian.h"
#include "journal-def.h"
#include "util.h"
-#include "sd-id128.h"
-
-#define DEFAULT_MAX_SIZE (128ULL*1024ULL*1024ULL)
-#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,10 +48,10 @@ enum {
};
typedef struct JournalMetrics {
+ uint64_t max_use;
uint64_t max_size;
uint64_t min_size;
uint64_t keep_free;
- uint64_t max_use;
} JournalMetrics;
typedef struct JournalFile {
@@ -81,7 +78,7 @@ typedef struct JournalFile {
#ifdef HAVE_XZ
void *compress_buffer;
- size_t compress_buffer_size;
+ uint64_t compress_buffer_size;
#endif
} JournalFile;
@@ -93,6 +90,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);
@@ -124,4 +123,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