#include <unistd.h>
#include <fcntl.h>
#include <sys/syslog.h>
+#include <sys/uio.h>
-#include "dasync.h"
+#include "dasynq.h"
#include "service.h"
#include "dinit-log.h"
#include "cpbuffer.h"
-extern EventLoop_t eventLoop;
+// Dinit logging subsystem.
+//
+// Note that most actual functions for logging messages are found in the header, dinit-log.h.
+//
+// We have two separate log "streams": one for the console/stdout, one for the syslog facility (or log
+// file). Both have a circular buffer. Log messages are appended to the circular buffer (for a syslog
+// stream, the messages are prepended with a syslog priority indicator). Both streams start out inactive
+// (release = true in buffered_log_stream), which means they will buffer messages but not write them.
+//
+// The console log stream needs to be able to release the console, if a service is waiting to acquire it.
+// This is accomplished by calling flush_for_release() which then completes the output of the current
+// message (if any) and then assigns the console to a waiting service.
+
+extern eventloop_t event_loop;
static bool log_current_line[2]; // Whether the current line is being logged (for console, main log)
-LogLevel log_level[2] = { LogLevel::WARN, LogLevel::WARN };
+loglevel_t log_level[2] = { loglevel_t::INFO, loglevel_t::WARN };
+static bool log_format_syslog[2] = { false, true };
-static ServiceSet *service_set = nullptr; // Reference to service set
+static service_set *services = nullptr; // Reference to service set
+
+dasynq::time_val release_time; // time the log was released
+
+using rearm = dasynq::rearm;
namespace {
-class BufferedLogStream : public PosixFdWatcher<NullMutex>
+class buffered_log_stream : public eventloop_t::fd_watcher_impl<buffered_log_stream>
{
private:
// A "special message" is not stored in the circular buffer; instead
// it is delivered from an external buffer not managed by BufferedLogger.
bool special = false; // currently outputting special message?
- char *special_buf; // buffer containing special message
+ const char *special_buf; // buffer containing special message
int msg_index; // index into special message
- CPBuffer<4096> log_buffer;
+ cpbuffer<4096> log_buffer;
public:
release = false;
}
- Rearm gotEvent(EventLoop_t *loop, int fd, int flags) noexcept override;
+ rearm fd_event(eventloop_t &loop, int fd, int flags) noexcept;
// Check whether the console can be released.
- void flushForRelease();
- void release_console();
+ void flush_for_release();
bool is_release_set() { return release; }
// Commit a log message
bool was_first = current_index == 0;
current_index = log_buffer.get_length();
if (was_first && ! release) {
- setEnabled(&eventLoop, true);
+ set_enabled(event_loop, true);
}
}
{
log_buffer.append(s, len);
}
+
+ // Discard buffer; call only when the stream isn't active.
+ void discard()
+ {
+ current_index = 0;
+ log_buffer.trim_to(0);
+ }
+
+ // Mark that a message was discarded due to full buffer
+ void mark_discarded()
+ {
+ discarded = true;
+ }
+
+ private:
+ void release_console();
};
}
// Two log streams:
// (One for main log, one for console)
-static BufferedLogStream log_stream[2];
+static buffered_log_stream log_stream[2];
constexpr static int DLOG_MAIN = 0; // main log facility
constexpr static int DLOG_CONS = 1; // console
-void BufferedLogStream::release_console()
+void buffered_log_stream::release_console()
{
if (release) {
int flags = fcntl(1, F_GETFL, 0);
fcntl(1, F_SETFL, flags & ~O_NONBLOCK);
- service_set->pullConsoleQueue();
+ services->pull_console_queue();
+ if (release) {
+ // release still set, we didn't immediately get the console back; record the
+ // time at which we released:
+ event_loop.get_time(release_time, clock_type::MONOTONIC);
+ }
}
}
-void BufferedLogStream::flushForRelease()
+void buffered_log_stream::flush_for_release()
{
release = true;
// Try to flush any messages that are currently buffered. (Console is non-blocking
// so it will fail gracefully).
- if (gotEvent(&eventLoop, fd, out_events) == Rearm::DISARM) {
+ if (fd_event(event_loop, fd, dasynq::OUT_EVENTS) == rearm::DISARM) {
// Console has already been released at this point.
- setEnabled(&eventLoop, false);
+ set_enabled(event_loop, false);
}
- // gotEvent didn't want to disarm, so must be partway through a message; will
+ // fd_event didn't want to disarm, so must be partway through a message; will
// release when it's finished.
}
-Rearm BufferedLogStream::gotEvent(EventLoop_t *loop, int fd, int flags) noexcept
+rearm buffered_log_stream::fd_event(eventloop_t &loop, int fd, int flags) noexcept
{
- auto &log_stream = *this;
-
- if ((! partway) && log_stream.special) {
- char * start = log_stream.special_buf + log_stream.msg_index;
- char * end = std::find(log_stream.special_buf + log_stream.msg_index, (char *)nullptr, '\n');
+ if ((! partway) && (! special) && discarded) {
+ special_buf = "dinit: *** log message discarded due to full buffer ***\n";
+ special = true;
+ discarded = false;
+ msg_index = 0;
+ }
+
+ if ((! partway) && special) {
+ const char * start = special_buf + msg_index;
+ const char * end = std::find(special_buf + msg_index, (const char *)nullptr, '\n');
int r = write(fd, start, end - start + 1);
if (r >= 0) {
if (start + r > end) {
// All written: go on to next message in queue
- log_stream.special = false;
- log_stream.partway = false;
- log_stream.msg_index = 0;
+ special = false;
+ discarded = false;
+ msg_index = 0;
if (release) {
release_console();
- return Rearm::DISARM;
+ return rearm::DISARM;
}
}
else {
- log_stream.msg_index += r;
- return Rearm::REARM;
+ msg_index += r;
+ return rearm::REARM;
}
}
else if (errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK) {
- return Rearm::REMOVE;
+ return rearm::REMOVE;
}
- return Rearm::REARM;
+ return rearm::REARM;
}
else {
// Writing from the regular circular buffer
- // TODO issue special message if we have discarded a log message
-
if (current_index == 0) {
release_console();
- return Rearm::DISARM;
+ return rearm::DISARM;
}
- char *ptr = log_stream.log_buffer.get_ptr(0);
- int len = log_stream.log_buffer.get_contiguous_length(ptr);
+ // We try to find a complete line (terminated by '\n') in the buffer, and write it
+ // out. Since it may span the circular buffer end, it may consist of two distinct spans,
+ // and so we use writev to write them atomically.
+
+ struct iovec logiov[2];
+
+ char *ptr = log_buffer.get_ptr(0);
+ int len = log_buffer.get_contiguous_length(ptr);
char *creptr = ptr + len; // contiguous region end
char *eptr = std::find(ptr, creptr, '\n');
len = eptr - ptr;
- int r = write(fd, ptr, len);
+ logiov[0].iov_base = ptr;
+ logiov[0].iov_len = len;
+ int iovs_to_write = 1;
+
+ // Do we need the second span?
+ if (! will_complete && len != log_buffer.get_length()) {
+ ptr = log_buffer.get_buf_base();
+ creptr = ptr + log_buffer.get_length() - len;
+ eptr = std::find(ptr, creptr, '\n');
+ if (eptr != creptr) {
+ eptr++; // include '\n'
+ // It should not ever be the case that we do not now have a complete message
+ will_complete = true;
+ }
+ logiov[1].iov_base = ptr;
+ logiov[1].iov_len = eptr - ptr;
+ len += logiov[1].iov_len;
+ iovs_to_write = 2;
+ }
+
+ ssize_t r = writev(fd, logiov, iovs_to_write);
if (r >= 0) {
bool complete = (r == len) && will_complete;
- log_stream.log_buffer.consume(len);
- log_stream.partway = ! complete;
+ log_buffer.consume(len);
+ partway = ! complete;
if (complete) {
- log_stream.current_index -= len;
- if (log_stream.current_index == 0 || release) {
+ current_index -= len;
+ if (current_index == 0 || release) {
// No more messages buffered / stop logging to console:
release_console();
- return Rearm::DISARM;
+ return rearm::DISARM;
}
}
}
else if (errno != EAGAIN && errno != EINTR && errno != EWOULDBLOCK) {
- return Rearm::REMOVE;
+ return rearm::REMOVE;
}
}
// We've written something by the time we get here. We could fall through to below, but
// let's give other events a chance to be processed by returning now.
- return Rearm::REARM;
+ return rearm::REARM;
}
// Initialise the logging subsystem
// Potentially throws std::bad_alloc or std::system_error
-void init_log(ServiceSet *sset)
+void init_log(service_set *sset, bool syslog_format)
{
- service_set = sset;
- log_stream[DLOG_CONS].registerWith(&eventLoop, STDOUT_FILENO, out_events); // TODO register in disabled state
+ services = sset;
+ log_stream[DLOG_CONS].add_watch(event_loop, STDOUT_FILENO, dasynq::OUT_EVENTS, false);
enable_console_log(true);
+
+ // The main (non-console) log won't be active yet, but we set the format here so that we
+ // buffer messages in the correct format:
+ log_format_syslog[DLOG_MAIN] = syslog_format;
}
// Set up the main log to output to the given file descriptor.
void setup_main_log(int fd)
{
log_stream[DLOG_MAIN].init(fd);
- log_stream[DLOG_MAIN].registerWith(&eventLoop, fd, out_events);
+ log_stream[DLOG_MAIN].add_watch(event_loop, fd, dasynq::OUT_EVENTS);
}
bool is_log_flushed() noexcept
{
bool log_to_console = ! log_stream[DLOG_CONS].is_release_set();
if (enable && ! log_to_console) {
- // Console is fd 1 - stdout
// Set non-blocking IO:
- int flags = fcntl(1, F_GETFL, 0);
- fcntl(1, F_SETFL, flags | O_NONBLOCK);
+ int flags = fcntl(STDOUT_FILENO, F_GETFL, 0);
+ fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK);
// Activate watcher:
log_stream[DLOG_CONS].init(STDOUT_FILENO);
- log_stream[DLOG_CONS].setEnabled(&eventLoop, true);
+ log_stream[DLOG_CONS].set_enabled(event_loop, true);
}
else if (! enable && log_to_console) {
- log_stream[DLOG_CONS].flushForRelease();
+ log_stream[DLOG_CONS].flush_for_release();
}
}
+void discard_console_log_buffer() noexcept
+{
+ // Only discard if more than a second has passed since we released the console.
+ dasynq::time_val current_time;
+ event_loop.get_time(current_time, clock_type::MONOTONIC);
+ if (current_time - release_time >= dasynq::time_val(1, 0)) {
+ log_stream[DLOG_CONS].discard();
+ }
+}
// Variadic method to calculate the sum of string lengths:
static int sum_length(const char *arg) noexcept
}
// Variadic method to append strings to a buffer:
-static void append(BufferedLogStream &buf, const char *s)
+static void append(buffered_log_stream &buf, const char *s)
{
buf.append(s, std::strlen(s));
}
-template <typename ... T> static void append(BufferedLogStream &buf, const char *u, T ... t)
+template <typename ... T> static void append(buffered_log_stream &buf, const char *u, T ... t)
{
append(buf, u);
append(buf, t...);
}
-static int log_level_to_syslog_level(LogLevel l)
+static int log_level_to_syslog_level(loglevel_t l)
{
switch (l) {
- case LogLevel::DEBUG:
+ case loglevel_t::DEBUG:
return LOG_DEBUG;
- case LogLevel::INFO:
+ case loglevel_t::INFO:
return LOG_INFO;
- case LogLevel::WARN:
+ case loglevel_t::WARN:
return LOG_WARNING;
- case LogLevel::ERROR:
+ case loglevel_t::ERROR:
return LOG_ERR;
default: ;
}
log_stream[idx].commit_msg();
}
else {
- // TODO mark a discarded message
+ log_stream[idx].mark_discarded();
}
}
// Variadic method to potentially log a sequence of strings as a single message with the given log level:
-template <typename ... T> static void do_log(LogLevel lvl, T ... args) noexcept
+template <typename ... T> static void do_log(loglevel_t lvl, bool to_cons, T ... args) noexcept
{
- log_current_line[DLOG_CONS] = lvl >= log_level[DLOG_CONS];
- log_current_line[DLOG_MAIN] = lvl >= log_level[DLOG_MAIN];
+ log_current_line[DLOG_CONS] = (lvl >= log_level[DLOG_CONS]) && to_cons;
+ log_current_line[DLOG_MAIN] = (lvl >= log_level[DLOG_MAIN]);
push_to_log(DLOG_CONS, args...);
if (log_current_line[DLOG_MAIN]) {
- char svcbuf[10];
- snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | log_level_to_syslog_level(lvl));
-
- push_to_log(DLOG_MAIN, svcbuf, args...);
+ if (log_format_syslog[DLOG_MAIN]) {
+ char svcbuf[10];
+ snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | log_level_to_syslog_level(lvl));
+ push_to_log(DLOG_MAIN, svcbuf, args...);
+ }
+ else {
+ push_to_log(DLOG_MAIN, args...);
+ }
}
}
log_current_line[DLOG_CONS] = false;
log_current_line[DLOG_MAIN] = true;
- char svcbuf[10];
- snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | LOG_NOTICE);
-
- push_to_log(DLOG_MAIN, svcbuf, args...);
+ if (log_format_syslog[DLOG_MAIN]) {
+ char svcbuf[10];
+ snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | LOG_NOTICE);
+ push_to_log(DLOG_MAIN, svcbuf, args...);
+ }
+ else {
+ push_to_log(DLOG_MAIN, args...);
+ }
}
// Log a message. A newline will be appended.
-void log(LogLevel lvl, const char *msg) noexcept
+void log(loglevel_t lvl, const char *msg) noexcept
{
- do_log(lvl, "dinit: ", msg, "\n");
+ do_log(lvl, true, "dinit: ", msg, "\n");
+}
+
+void log(loglevel_t lvl, bool to_cons, const char *msg) noexcept
+{
+ do_log(lvl, to_cons, "dinit: ", msg, "\n");
}
// Log part of a message. A series of calls to do_log_part must be followed by a call to do_log_commit.
else {
log_stream[idx].rollback_msg();
log_current_line[idx] = false;
- // TODO mark discarded message
+ log_stream[idx].mark_discarded();
}
}
}
}
// Log a multi-part message beginning
-void logMsgBegin(LogLevel lvl, const char *msg) noexcept
+void log_msg_begin(loglevel_t lvl, const char *msg) noexcept
{
log_current_line[DLOG_CONS] = lvl >= log_level[DLOG_CONS];
log_current_line[DLOG_MAIN] = lvl >= log_level[DLOG_MAIN];
+ // Prepend the syslog priority level string ("<N>") for the main log:
if (log_current_line[DLOG_MAIN]) {
- char svcbuf[10];
- snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | log_level_to_syslog_level(lvl));
- do_log_part(DLOG_MAIN, svcbuf);
+ if (log_format_syslog[DLOG_MAIN]) {
+ char svcbuf[10];
+ snprintf(svcbuf, 10, "<%d>", LOG_DAEMON | log_level_to_syslog_level(lvl));
+ do_log_part(DLOG_MAIN, svcbuf);
+ }
}
for (int i = 0; i < 2; i++) {
}
// Continue a multi-part log message
-void logMsgPart(const char *msg) noexcept
+void log_msg_part(const char *msg) noexcept
{
do_log_part(DLOG_CONS, msg);
do_log_part(DLOG_MAIN, msg);
}
// Complete a multi-part log message
-void logMsgEnd(const char *msg) noexcept
+void log_msg_end(const char *msg) noexcept
{
for (int i = 0; i < 2; i++) {
do_log_part(i, msg);
}
}
-void logServiceStarted(const char *service_name) noexcept
+void log_service_started(const char *service_name) noexcept
{
do_log_cons("[ OK ] ", service_name, "\n");
do_log_main("dinit: service ", service_name, " started.\n");
}
-void logServiceFailed(const char *service_name) noexcept
+void log_service_failed(const char *service_name) noexcept
{
do_log_cons("[FAILED] ", service_name, "\n");
do_log_main("dinit: service ", service_name, " failed to start.\n");
}
-void logServiceStopped(const char *service_name) noexcept
+void log_service_stopped(const char *service_name) noexcept
{
do_log_cons("[STOPPD] ", service_name, "\n");
do_log_main("dinit: service ", service_name, " stopped.\n");
projects / oweals / dinit.git / blobdiff