X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-server.h;h=559d10013199f4ddb845620656f875a4ca3f0ab3;hb=27cc6f166bdebc0e698fb692993b801db2618866;hp=86c4be4ba260a960d281e42d6f40315e7a6f3e23;hpb=0c24bb2346b6b6232d67aacd5236b56ea4989de4;p=elogind.git
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 86c4be4ba..559d10013 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -21,16 +21,12 @@
along with systemd; If not, see .
***/
-#include
#include
-#include
#include
-#include
#include "sd-event.h"
#include "journal-file.h"
#include "hashmap.h"
-#include "util.h"
#include "audit.h"
#include "journald-rate-limit.h"
#include "list.h"
@@ -45,8 +41,8 @@ typedef enum Storage {
} Storage;
typedef enum SplitMode {
- SPLIT_LOGIN,
SPLIT_UID,
+ SPLIT_LOGIN,
SPLIT_NONE,
_SPLIT_MAX,
_SPLIT_INVALID = -1
@@ -59,6 +55,7 @@ typedef struct Server {
int native_fd;
int stdout_fd;
int dev_kmsg_fd;
+ int audit_fd;
int hostname_fd;
sd_event *event;
@@ -67,6 +64,7 @@ typedef struct Server {
sd_event_source *native_event_source;
sd_event_source *stdout_event_source;
sd_event_source *dev_kmsg_event_source;
+ sd_event_source *audit_event_source;
sd_event_source *sync_event_source;
sd_event_source *sigusr1_event_source;
sd_event_source *sigusr2_event_source;
@@ -76,7 +74,7 @@ typedef struct Server {
JournalFile *runtime_journal;
JournalFile *system_journal;
- Hashmap *user_journals;
+ OrderedHashmap *user_journals;
uint64_t seqnum;
@@ -97,6 +95,7 @@ typedef struct Server {
bool forward_to_kmsg;
bool forward_to_syslog;
bool forward_to_console;
+ bool forward_to_wall;
unsigned n_forward_syslog_missed;
usec_t last_warn_forward_syslog_missed;
@@ -119,6 +118,7 @@ typedef struct Server {
int max_level_syslog;
int max_level_kmsg;
int max_level_console;
+ int max_level_wall;
Storage storage;
SplitMode split_mode;
@@ -136,6 +136,9 @@ typedef struct Server {
char machine_id_field[sizeof("_MACHINE_ID=") + 32];
char boot_id_field[sizeof("_BOOT_ID=") + 32];
char *hostname_field;
+
+ /* Cached cgroup root, so that we don't have to query that all the time */
+ char *cgroup_root;
} Server;
#define N_IOVEC_META_FIELDS 20
@@ -143,7 +146,7 @@ typedef struct Server {
#define N_IOVEC_UDEV_FIELDS 32
#define N_IOVEC_OBJECT_FIELDS 11
-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, pid_t object_pid);
+void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, const struct ucred *ucred, const struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority, pid_t object_pid);
void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,4);
/* gperf lookup function */
@@ -160,7 +163,6 @@ const char *split_mode_to_string(SplitMode s) _const_;
SplitMode split_mode_from_string(const char *s) _pure_;
void server_fix_perms(Server *s, JournalFile *f, uid_t uid);
-bool shall_try_append_again(JournalFile *f, int r);
int server_init(Server *s);
void server_done(Server *s);
void server_sync(Server *s);
@@ -169,4 +171,4 @@ void server_rotate(Server *s);
int server_schedule_sync(Server *s, int priority);
int server_flush_to_var(Server *s);
void server_maybe_append_tags(Server *s);
-int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata);
+int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userdata);