X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald.h;h=cd06b40c2fa97a79a5e7b2262e9f20413d81d8f1;hp=159364d930bf61fdddfdbf19dc271a474055421c;hb=178cc7700c23ac088cd7190d7854282075028d91;hpb=213ba152fdf7978773be5b8a72e040584765137f

diff --git a/src/journal/journald.h b/src/journal/journald.h
index 159364d93..cd06b40c2 100644
--- a/src/journal/journald.h
+++ b/src/journal/journald.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foojournaldhfoo
-#define foojournaldhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -30,9 +29,26 @@
 #include "hashmap.h"
 #include "util.h"
 #include "audit.h"
-#include "journal-rate-limit.h"
+#include "journald-rate-limit.h"
 #include "list.h"
 
+typedef enum Storage {
+        STORAGE_AUTO,
+        STORAGE_VOLATILE,
+        STORAGE_PERSISTENT,
+        STORAGE_NONE,
+        _STORAGE_MAX,
+        _STORAGE_INVALID = -1
+} Storage;
+
+typedef enum SplitMode {
+        SPLIT_LOGIN,
+        SPLIT_UID,
+        SPLIT_NONE,
+        _SPLIT_MAX,
+        _SPLIT_INVALID = -1
+} SplitMode;
+
 typedef struct StdoutStream StdoutStream;
 
 typedef struct Server {
@@ -41,7 +57,7 @@ typedef struct Server {
         int syslog_fd;
         int native_fd;
         int stdout_fd;
-        int proc_kmsg_fd;
+        int dev_kmsg_fd;
 
         JournalFile *runtime_journal;
         JournalFile *system_journal;
@@ -60,14 +76,14 @@ typedef struct Server {
         JournalMetrics system_metrics;
 
         bool compress;
+        bool seal;
 
         bool forward_to_kmsg;
         bool forward_to_syslog;
         bool forward_to_console;
 
-        bool import_proc_kmsg;
-        char proc_kmsg_buffer[LINE_MAX+1];
-        size_t proc_kmsg_length;
+        unsigned n_forward_syslog_missed;
+        usec_t last_warn_forward_syslog_missed;
 
         uint64_t cached_available_space;
         usec_t cached_available_space_timestamp;
@@ -86,9 +102,35 @@ typedef struct Server {
         int max_level_syslog;
         int max_level_kmsg;
         int max_level_console;
+
+        Storage storage;
+        SplitMode split_mode;
+
+        MMapCache *mmap;
+
+        bool dev_kmsg_readable;
+
+        uint64_t *kernel_seqnum;
+
+        struct udev *udev;
 } Server;
 
+#define N_IOVEC_META_FIELDS 17
+#define N_IOVEC_KERNEL_FIELDS 64
+#define N_IOVEC_UDEV_FIELDS 32
+
+void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, struct ucred *ucred, struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority);
+void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...);
+
 /* gperf lookup function */
 const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
 
-#endif
+int config_parse_storage(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+const char *storage_to_string(Storage s);
+Storage storage_from_string(const char *s);
+
+int config_parse_split_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+
+const char *split_mode_to_string(SplitMode s);
+SplitMode split_mode_from_string(const char *s);