[systemd-commits] 3 commits - .mailmap TODO man/journald.conf.xml man/sd_get_seats.xml src/journal
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Aug 9 06:57:54 PDT 2012
.mailmap | 21 +++
TODO | 4
man/journald.conf.xml | 28 ----
man/sd_get_seats.xml | 2
src/journal/journald-gperf.gperf | 1
src/journal/journald.c | 242 +++++++++++++++------------------------
src/journal/journald.conf | 1
src/journal/journald.h | 8 -
8 files changed, 132 insertions(+), 175 deletions(-)
New commits:
commit 51abe64c859c01ffad4f80840396ad9f6d5c9e62
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 9 15:57:24 2012 +0200
journald: basic support for /dev/kmsg parsing
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index d7caea8..2ebbf30 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -210,17 +210,12 @@
is running the respective option has
no effect. By default only forwarding
to syslog is enabled. These settings
- may be overridden at boot time with the
- kernel command line options
+ may be overridden at boot time with
+ the kernel command line options
<literal>systemd.journald.forward_to_syslog=</literal>,
<literal>systemd.journald.forward_to_kmsg=</literal>
and
- <literal>systemd.journald.forward_to_console=</literal>. If
- forwarding to the kernel log buffer and
- <varname>ImportKernel=</varname> is
- enabled at the same time care is taken
- to avoid logging loops. It is safe to
- use these options in combination.
+ <literal>systemd.journald.forward_to_console=</literal>.
</para></listitem>
</varlistentry>
@@ -271,23 +266,6 @@
</varlistentry>
<varlistentry>
- <term><varname>ImportKernel=</varname></term>
-
- <listitem><para>Controls whether
- kernel log messages shall be stored in
- the journal. Takes a boolean argument
- and defaults to disabled. Note that
- currently only one userspace service
- can read kernel messages at a time,
- which means that kernel log message
- reading might get corrupted if it
- is enabled in more than one service,
- for example in both the journal and a
- traditional syslog service.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><varname>Storage=</varname></term>
<listitem><para>Controls where to
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
index 4fe2ea0..d4019dd 100644
--- a/src/journal/journald-gperf.gperf
+++ b/src/journal/journald-gperf.gperf
@@ -28,7 +28,6 @@ Journal.RuntimeKeepFree, config_parse_bytes_off, 0, offsetof(Server, runtime_
Journal.ForwardToSyslog, config_parse_bool, 0, offsetof(Server, forward_to_syslog)
Journal.ForwardToKMsg, config_parse_bool, 0, offsetof(Server, forward_to_kmsg)
Journal.ForwardToConsole, config_parse_bool, 0, offsetof(Server, forward_to_console)
-Journal.ImportKernel, config_parse_bool, 0, offsetof(Server, import_proc_kmsg)
Journal.TTYPath, config_parse_path, 0, offsetof(Server, tty_path)
Journal.MaxLevelStore, config_parse_level, 0, offsetof(Server, max_level_store)
Journal.MaxLevelSyslog, config_parse_level, 0, offsetof(Server, max_level_syslog)
diff --git a/src/journal/journald.c b/src/journal/journald.c
index af136e5..1d40fa8 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -955,14 +955,16 @@ static void forward_kmsg(Server *s, int priority, const char *identifier, const
char header_priority[6], header_pid[16];
int n = 0;
char *ident_buf = NULL;
- int fd;
assert(s);
assert(priority >= 0);
assert(priority <= 999);
assert(message);
- if (LOG_PRI(priority) > s->max_level_kmsg)
+ if (_unlikely_(LOG_PRI(priority) > s->max_level_kmsg))
+ return;
+
+ if (_unlikely_(s->dev_kmsg_fd < 0))
return;
/* Never allow messages with kernel facility to be written to
@@ -997,18 +999,9 @@ static void forward_kmsg(Server *s, int priority, const char *identifier, const
IOVEC_SET_STRING(iovec[n++], message);
IOVEC_SET_STRING(iovec[n++], "\n");
- fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC);
- if (fd < 0) {
- log_debug("Failed to open /dev/kmsg for logging: %s", strerror(errno));
- goto finish;
- }
-
- if (writev(fd, iovec, n) < 0)
+ if (writev(s->dev_kmsg_fd, iovec, n) < 0)
log_debug("Failed to write to /dev/kmsg for logging: %s", strerror(errno));
- close_nointr_nofail(fd);
-
-finish:
free(ident_buf);
}
@@ -1802,52 +1795,6 @@ fail:
return r;
}
-static int parse_kernel_timestamp(char **_p, usec_t *t) {
- usec_t r;
- int k, i;
- char *p;
-
- assert(_p);
- assert(*_p);
- assert(t);
-
- p = *_p;
-
- if (strlen(p) < 14 || p[0] != '[' || p[13] != ']' || p[6] != '.')
- return 0;
-
- r = 0;
-
- for (i = 1; i <= 5; i++) {
- r *= 10;
-
- if (p[i] == ' ')
- continue;
-
- k = undecchar(p[i]);
- if (k < 0)
- return 0;
-
- r += k;
- }
-
- for (i = 7; i <= 12; i++) {
- r *= 10;
-
- k = undecchar(p[i]);
- if (k < 0)
- return 0;
-
- r += k;
- }
-
- *t = r;
- *_p += 14;
- *_p += strspn(*_p, WHITESPACE);
-
- return 1;
-}
-
static bool is_us(const char *pid) {
pid_t t;
@@ -1859,53 +1806,84 @@ static bool is_us(const char *pid) {
return t == getpid();
}
-static void proc_kmsg_line(Server *s, const char *p) {
+static void dev_kmsg_record(Server *s, char *p, size_t l) {
struct iovec iovec[N_IOVEC_META_FIELDS + 7];
char *message = NULL, *syslog_priority = NULL, *syslog_pid = NULL, *syslog_facility = NULL, *syslog_identifier = NULL, *source_time = NULL;
- int priority = LOG_KERN | LOG_INFO;
+ int priority, r;
unsigned n = 0;
usec_t usec;
- char *identifier = NULL, *pid = NULL;
+ char *identifier = NULL, *pid = NULL, *e, *f;
+ uint64_t serial;
assert(s);
assert(p);
- if (isempty(p))
+ if (l <= 0)
return;
- parse_syslog_priority((char **) &p, &priority);
+ e = memchr(p, ',', l);
+ if (!e)
+ return;
+ *e = 0;
+
+ r = safe_atoi(p, &priority);
+ if (r < 0 || priority < 0 || priority > 999)
+ return;
if (s->forward_to_kmsg && (priority & LOG_FACMASK) != LOG_KERN)
return;
- if (parse_kernel_timestamp((char **) &p, &usec) > 0) {
- if (asprintf(&source_time, "_SOURCE_MONOTONIC_TIMESTAMP=%llu",
- (unsigned long long) usec) >= 0)
- IOVEC_SET_STRING(iovec[n++], source_time);
- }
+ l -= (e - p) + 1;
+ p = e + 1;
+ e = memchr(p, ',', l);
+ if (!e)
+ return;
+ *e = 0;
+
+ r = safe_atou64(p, &serial);
+ if (r < 0)
+ return;
+
+ l -= (e - p) + 1;
+ p = e + 1;
+ f = memchr(p, ';', l);
+ if (!f)
+ return;
+ /* Kernel 3.6 has the flags field, kernel 3.5 lacks that */
+ e = memchr(p, ',', l);
+ if (!e || f < e)
+ e = f;
+ *e = 0;
+
+ r = parse_usec(p, &usec);
+ if (r < 0)
+ return;
+
+ l -= (f - p) + 1;
+ p = f + 1;
+ e = memchr(p, '\n', l);
+ if (e)
+ *e = 0;
+
+ if (asprintf(&source_time, "_SOURCE_MONOTONIC_TIMESTAMP=%llu",
+ (unsigned long long) usec) >= 0)
+ IOVEC_SET_STRING(iovec[n++], source_time);
IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=kernel");
if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
IOVEC_SET_STRING(iovec[n++], syslog_priority);
- if ((priority & LOG_FACMASK) == LOG_KERN) {
-
- if (s->forward_to_syslog)
- forward_syslog(s, priority, "kernel", p, NULL, NULL);
-
+ if ((priority & LOG_FACMASK) == LOG_KERN)
IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
- } else {
- read_identifier(&p, &identifier, &pid);
+ else {
+ read_identifier((const char**) &p, &identifier, &pid);
/* Avoid any messages we generated ourselves via
* log_info() and friends. */
if (pid && is_us(pid))
goto finish;
- if (s->forward_to_syslog)
- forward_syslog(s, priority, identifier, p, NULL, NULL);
-
if (identifier) {
syslog_identifier = strappend("SYSLOG_IDENTIFIER=", identifier);
if (syslog_identifier)
@@ -1939,41 +1917,6 @@ finish:
free(pid);
}
-static void proc_kmsg_scan(Server *s) {
- char *p;
- size_t remaining;
-
- assert(s);
-
- p = s->proc_kmsg_buffer;
- remaining = s->proc_kmsg_length;
- for (;;) {
- char *end;
- size_t skip;
-
- end = memchr(p, '\n', remaining);
- if (end)
- skip = end - p + 1;
- else if (remaining >= sizeof(s->proc_kmsg_buffer) - 1) {
- end = p + sizeof(s->proc_kmsg_buffer) - 1;
- skip = remaining;
- } else
- break;
-
- *end = 0;
-
- proc_kmsg_line(s, p);
-
- remaining -= skip;
- p += skip;
- }
-
- if (p > s->proc_kmsg_buffer) {
- memmove(s->proc_kmsg_buffer, p, remaining);
- s->proc_kmsg_length = remaining;
- }
-}
-
static int system_journal_open(Server *s) {
int r;
char *fn;
@@ -2149,17 +2092,24 @@ finish:
return r;
}
-static int server_read_proc_kmsg(Server *s) {
+static int server_read_dev_kmsg(Server *s) {
+ char buffer[8192+1]; /* the kernel-side limit per record is 8K currently */
ssize_t l;
+
assert(s);
- assert(s->proc_kmsg_fd >= 0);
+ assert(s->dev_kmsg_fd >= 0);
- l = read(s->proc_kmsg_fd, s->proc_kmsg_buffer + s->proc_kmsg_length, sizeof(s->proc_kmsg_buffer) - 1 - s->proc_kmsg_length);
- if (l == 0) /* the kernel is stupid and in some race
- * conditions returns 0 in the middle of the
- * stream. */
+ l = read(s->dev_kmsg_fd, buffer, sizeof(buffer) - 1);
+ if (l == 0)
return 0;
if (l < 0) {
+ /* Old kernels who don't allow reading from /dev/kmsg
+ * return EINVAL when we try. So handle this cleanly,
+ * but don' try to ever read from it again. */
+ if (errno == EINVAL) {
+ epoll_ctl(s->epoll_fd, EPOLL_CTL_DEL, s->dev_kmsg_fd, NULL);
+ return 0;
+ }
if (errno == EAGAIN || errno == EINTR)
return 0;
@@ -2168,24 +2118,25 @@ static int server_read_proc_kmsg(Server *s) {
return -errno;
}
- s->proc_kmsg_length += l;
-
- proc_kmsg_scan(s);
+ dev_kmsg_record(s, buffer, l);
return 1;
}
-static int server_flush_proc_kmsg(Server *s) {
+static int server_flush_dev_kmsg(Server *s) {
int r;
assert(s);
- if (s->proc_kmsg_fd < 0)
+ if (s->dev_kmsg_fd < 0)
+ return 0;
+
+ if (!s->dev_kmsg_readable)
return 0;
- log_info("Flushing /proc/kmsg...");
+ log_info("Flushing /dev/kmsg...");
for (;;) {
- r = server_read_proc_kmsg(s);
+ r = server_read_dev_kmsg(s);
if (r < 0)
return r;
@@ -2237,7 +2188,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
return 0;
- } else if (ev->data.fd == s->proc_kmsg_fd) {
+ } else if (ev->data.fd == s->dev_kmsg_fd) {
int r;
if (ev->events != EPOLLIN) {
@@ -2245,7 +2196,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
return -EIO;
}
- r = server_read_proc_kmsg(s);
+ r = server_read_dev_kmsg(s);
if (r < 0)
return r;
@@ -2590,28 +2541,33 @@ static int open_stdout_socket(Server *s) {
return 0;
}
-static int open_proc_kmsg(Server *s) {
+static int open_dev_kmsg(Server *s) {
struct epoll_event ev;
assert(s);
- if (!s->import_proc_kmsg)
- return 0;
-
- s->proc_kmsg_fd = open("/proc/kmsg", O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
- if (s->proc_kmsg_fd < 0) {
- log_warning("Failed to open /proc/kmsg, ignoring: %m");
+ s->dev_kmsg_fd = open("/dev/kmsg", O_RDWR|O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
+ if (s->dev_kmsg_fd < 0) {
+ log_warning("Failed to open /dev/kmsg, ignoring: %m");
return 0;
}
zero(ev);
ev.events = EPOLLIN;
- ev.data.fd = s->proc_kmsg_fd;
- if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->proc_kmsg_fd, &ev) < 0) {
- log_error("Failed to add /proc/kmsg fd to epoll object: %m");
+ ev.data.fd = s->dev_kmsg_fd;
+ if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->dev_kmsg_fd, &ev) < 0) {
+
+ /* This will fail with EPERM on older kernels where
+ * /dev/kmsg is not readable. */
+ if (errno == EPERM)
+ return 0;
+
+ log_error("Failed to add /dev/kmsg fd to epoll object: %m");
return -errno;
}
+ s->dev_kmsg_readable = true;
+
return 0;
}
@@ -2729,7 +2685,7 @@ static int server_init(Server *s) {
assert(s);
zero(*s);
- s->syslog_fd = s->native_fd = s->stdout_fd = s->signal_fd = s->epoll_fd = s->proc_kmsg_fd = -1;
+ s->syslog_fd = s->native_fd = s->stdout_fd = s->signal_fd = s->epoll_fd = s->dev_kmsg_fd = -1;
s->compress = true;
s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
@@ -2811,7 +2767,7 @@ static int server_init(Server *s) {
if (r < 0)
return r;
- r = open_proc_kmsg(s);
+ r = open_dev_kmsg(s);
if (r < 0)
return r;
@@ -2863,8 +2819,8 @@ static void server_done(Server *s) {
if (s->stdout_fd >= 0)
close_nointr_nofail(s->stdout_fd);
- if (s->proc_kmsg_fd >= 0)
- close_nointr_nofail(s->proc_kmsg_fd);
+ if (s->dev_kmsg_fd >= 0)
+ close_nointr_nofail(s->dev_kmsg_fd);
if (s->rate_limit)
journal_rate_limit_free(s->rate_limit);
@@ -2900,7 +2856,7 @@ int main(int argc, char *argv[]) {
server_vacuum(&server);
server_flush_to_var(&server);
- server_flush_proc_kmsg(&server);
+ server_flush_dev_kmsg(&server);
log_debug("systemd-journald running as pid %lu", (unsigned long) getpid());
driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index fc946da..ab7b4ab 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -22,7 +22,6 @@
#ForwardToSyslog=yes
#ForwardToKMsg=no
#ForwardToConsole=no
-#ImportKernel=no
#TTYPath=/dev/console
#MaxLevelStore=debug
#MaxLevelSyslog=debug
diff --git a/src/journal/journald.h b/src/journal/journald.h
index acf19b4..7e23bfc 100644
--- a/src/journal/journald.h
+++ b/src/journal/journald.h
@@ -49,7 +49,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;
@@ -73,10 +73,6 @@ typedef struct Server {
bool forward_to_syslog;
bool forward_to_console;
- bool import_proc_kmsg;
- char proc_kmsg_buffer[LINE_MAX+1];
- size_t proc_kmsg_length;
-
uint64_t cached_available_space;
usec_t cached_available_space_timestamp;
@@ -96,6 +92,8 @@ typedef struct Server {
int max_level_console;
Storage storage;
+
+ bool dev_kmsg_readable;
} Server;
/* gperf lookup function */
commit 4e818ef351aa6c8239b125713a91f5fc682a5e26
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 9 15:57:01 2012 +0200
man: clarify the order of seats in sd_get_seats() is undefined
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
index 28d06e9..17adcef 100644
--- a/man/sd_get_seats.xml
+++ b/man/sd_get_seats.xml
@@ -89,6 +89,8 @@
<para>Similar, <function>sd_get_uids()</function> may
be used to determine all Unix users who currently have login sessions.</para>
+
+ <para>Note that the returned lists are not sorted and in an undefined order.</para>
</refsect1>
<refsect1>
commit 0790b9fed42eefc4e22dbbe2337cba9713b7848c
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Aug 9 12:52:49 2012 +0200
update mailmap
diff --git a/.mailmap b/.mailmap
index 876d770..da8ca84 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,3 +22,24 @@ Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> Zbyszek Szmek <zbyszek at in.waw.p
Fabiano Fidêncio <fabianofidencio at gmail.com> Fabiano Fidencio <fidencio at profusion.mobi>
Martin Pitt <martinpitt at gnome.org>
Martin Pitt <martinpitt at gnome.org> <martin.pitt at ubuntu.com>
+Daniel J Walsh <dwalsh at redhat.com>
+Dave Reisner <dreisner at archlinux.org> <d at falconindy.com>
+Diego Elio Pettenò <flameeyes at gmail.com>
+Daniel Elstner <daniel.kitta at gmail.com> <danielk at openismus.com>
+Frederic Crozat <fcrozat at suse.com> <fcrozat at mandriva.com>
+Ian Campbell <ijc at hellion.org.uk> <Ian.Campbell at citrix.com>
+Jerone Young <jyoung at redhat.com> <jerone.young at canonical.com>
+Luis Felipe Strano Moraes <luis.strano at gmail.com> <lfelipe at profusion.mobi>
+Mario Limonciello <mario_limonciello at dell.com> <Mario_Limonciello at dell.com>
+Matthias Clasen <mclasen at redhat.com> <matthias.clasen at gmail.com>
+Michal Soltys <soltys at ziu.info> <nozo at ziu.info>
+Piter PUNK <piterpunk at slackware.com> <piterpk at terra.com.br>
+Richard Hughes <richard at hughsie.com> <hughsient at gmail.com>
+Robby Workman <rw at rlworkman.net> <rworkman at slackware.com>
+Shawn Landden <shawnlandden at gmail.com>
+Simon Peeters <peeters.simon at gmail.com>
+Tobias Klauser <tklauser at distanz.ch> <tklauser at nuerscht.ch>
+Miklos Vajna <vmiklos at frugalware.org> <vmiklos at gmail.com>
+William Jon McCann <jmccann at redhat.com> <william.jon.mccann at gmail.com>
+Yin Kangkai <kangkai.yin at intel.com> <kangkai.yin at linux.intel.com>
+Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
diff --git a/TODO b/TODO
index d1fcfb4..c21d39e 100644
--- a/TODO
+++ b/TODO
@@ -53,6 +53,10 @@ Bugfixes:
Features:
+* drop PID 1 reloading, only do reexecing
+
+* document that service reload may be implemented as service reexec
+
* systemctl daemon-reexec is borked
* add option to reconfigure success exit codes/signals for services
More information about the systemd-commits
mailing list