/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 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
+ (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.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
#include <sys/socket.h>
#include <sys/types.h>
#include <assert.h>
STREAM_RUNNING
} StreamState;
-typedef enum LogTarget {
- LOG_TARGET_SYSLOG,
- LOG_TARGET_KMSG
-} LogTarget;
-
struct Stream {
Server *server;
LIST_FIELDS(Stream, stream);
};
-#define IOVEC_SET_STRING(iovec, s) \
- do { \
- (iovec).iov_base = s; \
- (iovec).iov_len = strlen(s); \
- } while(false);
-
static int stream_log(Stream *s, char *p, usec_t timestamp) {
char header_priority[16], header_time[64], header_pid[16];
- struct msghdr msghdr;
struct iovec iovec[5];
assert(s);
IOVEC_SET_STRING(iovec[0], header_priority);
if (s->target == LOG_TARGET_SYSLOG) {
+ struct msghdr msghdr;
+
IOVEC_SET_STRING(iovec[1], header_time);
IOVEC_SET_STRING(iovec[2], s->process);
IOVEC_SET_STRING(iovec[3], header_pid);
IOVEC_SET_STRING(iovec[1], s->process);
IOVEC_SET_STRING(iovec[2], header_pid);
IOVEC_SET_STRING(iovec[3], p);
- IOVEC_SET_STRING(iovec[4], "\n");
+ IOVEC_SET_STRING(iovec[4], (char*) "\n");
if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0)
return -errno;
zero(ev);
ev.data.ptr = stream;
- ev.events = POLLIN;
+ ev.events = EPOLLIN;
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
goto fail;
struct epoll_event ev;
zero(ev);
- ev.events = POLLIN;
+ ev.events = EPOLLIN;
ev.data.ptr = UINT_TO_PTR(SERVER_FD_START+i);
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, SERVER_FD_START+i, &ev) < 0) {
r = -errno;
if (PTR_TO_UINT(ev->data.ptr) >= SERVER_FD_START &&
PTR_TO_UINT(ev->data.ptr) < SERVER_FD_START+s->n_server_fd) {
- if (ev->events != POLLIN) {
+ if (ev->events != EPOLLIN) {
log_info("Got invalid event from epoll. (1)");
return -EIO;
}
timestamp = now(CLOCK_REALTIME);
- if (!(ev->events & POLLIN)) {
+ if (!(ev->events & EPOLLIN)) {
log_info("Got invalid event from epoll. (3)");
stream_free(stream);
return 0;
for (;;) {
struct epoll_event event;
- int n;
+ int k;
- if ((n = epoll_wait(server.epoll_fd,
+ if ((k = epoll_wait(server.epoll_fd,
&event, 1,
server.n_streams <= 0 ? TIMEOUT : -1)) < 0) {
goto fail;
}
- if (n <= 0)
+ if (k <= 0)
break;
- if ((r = process_event(&server, &event)) < 0)
+ if ((k = process_event(&server, &event)) < 0)
goto fail;
}
r = 0;