summaryrefslogtreecommitdiff
path: root/src/journal/journald.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-12 17:29:07 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-11-14 23:39:53 +0100
commitd025f1e4dca8fc1436aff76f9e6185fe3e728daa (patch)
tree7cddcd1bfeebe2f8e7bbac0ac249755aa91789e6 /src/journal/journald.h
parentbe1015dd347edd9d72eebb444c88dddf92383c18 (diff)
build-sys: store journald code in a noinst library
The point is to allow the use of journald functions by other binaries. Before, journald code was split into multiple files (journald-*.[ch]), but all those files all required functions from journald.c. And journald.c has its own main(). Now, it is possible to link against those functions, e.g. from test binaries. This constitutes a fix for https://bugzilla.redhat.com/show_bug.cgi?id=872638. The patch does the following: 1. rename journald.h to journald-server.h and move corresponding code to journald-server.c. 2. add journald-server.c and other journald-*.c parts to libsystemd-journal-internal. 3. remove journald-syslog.c from test_journal_syslog_SOURCES, since it is now contained in libsystemd-journal-internal. There are no code changes, apart from the removal of a few static's, to allow function calls between files.
Diffstat (limited to 'src/journal/journald.h')
-rw-r--r--src/journal/journald.h141
1 files changed, 0 insertions, 141 deletions
diff --git a/src/journal/journald.h b/src/journal/journald.h
deleted file mode 100644
index e3ef3b529d..0000000000
--- a/src/journal/journald.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#pragma once
-
-/***
- This file is part of systemd.
-
- Copyright 2011 Lennart Poettering
-
- systemd is free software; you can redistribute it and/or modify it
- 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <stdbool.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "journal-file.h"
-#include "hashmap.h"
-#include "util.h"
-#include "audit.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 {
- int epoll_fd;
- int signal_fd;
- int syslog_fd;
- int native_fd;
- int stdout_fd;
- int dev_kmsg_fd;
-
- JournalFile *runtime_journal;
- JournalFile *system_journal;
- Hashmap *user_journals;
-
- uint64_t seqnum;
-
- char *buffer;
- size_t buffer_size;
-
- JournalRateLimit *rate_limit;
- usec_t rate_limit_interval;
- unsigned rate_limit_burst;
-
- JournalMetrics runtime_metrics;
- JournalMetrics system_metrics;
-
- bool compress;
- bool seal;
-
- bool forward_to_kmsg;
- bool forward_to_syslog;
- bool forward_to_console;
-
- unsigned n_forward_syslog_missed;
- usec_t last_warn_forward_syslog_missed;
-
- uint64_t cached_available_space;
- usec_t cached_available_space_timestamp;
-
- uint64_t var_available_timestamp;
-
- usec_t max_retention_usec;
- usec_t max_file_usec;
- usec_t oldest_file_usec;
-
- gid_t file_gid;
- bool file_gid_valid;
-
- LIST_HEAD(StdoutStream, stdout_streams);
- unsigned n_stdout_streams;
-
- char *tty_path;
-
- int max_level_store;
- 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);
-
-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);