Index: .bzrignore =================================================================== --- .bzrignore (revision 927cd9ce784b0e6c27b4862e22e7019f1b721585) +++ .bzrignore (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -279,2 +279,4 @@ uspace/app/viewer/viewer uspace/dist/app/viewer +uspace/srv/klog/klog +uspace/dist/srv/klog Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 927cd9ce784b0e6c27b4862e22e7019f1b721585) +++ boot/Makefile.common (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -96,5 +96,6 @@ $(USPACE_PATH)/srv/devman/devman \ $(USPACE_PATH)/srv/fs/locfs/locfs \ - $(USPACE_PATH)/srv/hid/compositor/compositor + $(USPACE_PATH)/srv/hid/compositor/compositor \ + $(USPACE_PATH)/srv/klog/klog RD_SRVS_NON_ESSENTIAL = \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 927cd9ce784b0e6c27b4862e22e7019f1b721585) +++ uspace/Makefile (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -92,4 +92,5 @@ srv/locsrv \ srv/logger \ + srv/klog \ srv/devman \ srv/loader \ Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 927cd9ce784b0e6c27b4862e22e7019f1b721585) +++ uspace/lib/c/Makefile (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -108,4 +108,5 @@ generic/io/logctl.c \ generic/io/kio.c \ + generic/io/klog.c \ generic/io/snprintf.c \ generic/io/vprintf.c \ Index: uspace/srv/klog/Makefile =================================================================== --- uspace/srv/klog/Makefile (revision 0caa075ea82d03f424199300f84ace6747f5bd02) +++ uspace/srv/klog/Makefile (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +BINARY = klog + +SOURCES = \ + klog.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/klog/klog.c =================================================================== --- uspace/srv/klog/klog.c (revision 0caa075ea82d03f424199300f84ace6747f5bd02) +++ uspace/srv/klog/klog.c (revision 0caa075ea82d03f424199300f84ace6747f5bd02) @@ -0,0 +1,260 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * Copyright (c) 2013 Martin Sucha + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup klog KLog + * @brief HelenOS KLog + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "klog" + +typedef struct { + size_t entry_len; + uint32_t serial; + uint32_t facility; + uint32_t level; + char message[0]; + +} __attribute__((__packed__)) log_entry_t; + +/* Producer/consumer buffers */ +typedef struct { + link_t link; + size_t size; + log_entry_t *data; +} item_t; + +static prodcons_t pc; + +/* Pointer to buffer where kernel stores new entries */ +#define BUFFER_SIZE PAGE_SIZE +static void *buffer; + +/* Notification mutex */ +static FIBRIL_MUTEX_INITIALIZE(mtx); + +static log_t kernel_ctx; +static const char *facility_name[] = { + "other", + "uspace", + "arch" +}; + +#define facility_len (sizeof(facility_name) / sizeof(const char *)) +static log_t facility_ctx[facility_len]; + +/** Klog producer + * + * Copies the log entries to a producer/consumer queue. + * + * @param length Number of characters to copy. + * @param data Pointer to the kernel klog buffer. + * + */ +static void producer() +{ + int read = klog_read(buffer, BUFFER_SIZE); + + if (read < 0) { + log_msg(LOG_DEFAULT, LVL_ERROR, "klog_read failed, rc = %d", + read); + return; + } + + size_t len = read; + size_t offset = 0; + while (offset < len) { + size_t entry_len = *((size_t *) (buffer + offset)); + + if (offset + entry_len > len || entry_len < sizeof(log_entry_t)) + break; + + log_entry_t *buf = malloc(entry_len + 1); + if (buf == NULL) + break; + + item_t *item = malloc(sizeof(item_t)); + if (item == NULL) { + free(buf); + break; + } + + memcpy(buf, buffer + offset, entry_len); + *((uint8_t *) buf + entry_len) = 0; + link_initialize(&item->link); + item->size = entry_len; + item->data = buf; + prodcons_produce(&pc, &item->link); + + offset += entry_len; + } +} + +/** Klog consumer + * + * Waits in an infinite loop for the log data created by + * the producer and logs them to the logger. + * + * @param data Unused. + * + * @return Always EOK (unreachable). + * + */ +static int consumer(void *data) +{ + + while (true) { + link_t *link = prodcons_consume(&pc); + item_t *item = list_get_instance(link, item_t, link); + + if (item->size < sizeof(log_entry_t)) { + free(item->data); + free(item); + continue; + } + + if (item->data->facility == LF_USPACE) { + /* Avoid reposting messages */ + free(item->data); + free(item); + continue; + } + + log_t ctx = kernel_ctx; + if (item->data->facility < facility_len) { + ctx = facility_ctx[item->data->facility]; + } + + log_level_t lvl = item->data->level; + if (lvl > LVL_LIMIT) + lvl = LVL_NOTE; + + log_msg(ctx, lvl, "%s", item->data->message); + + free(item->data); + free(item); + } + + return EOK; +} + +/** Kernel notification handler + * + * Receives kernel klog notifications. + * + * @param callid IPC call ID + * @param call IPC call structure + * @param arg Local argument + * + */ +static void notification_received(ipc_callid_t callid, ipc_call_t *call) +{ + /* + * Make sure we process only a single notification + * at any time to limit the chance of the consumer + * starving. + */ + + fibril_mutex_lock(&mtx); + + producer(); + + event_unmask(EVENT_KLOG); + fibril_mutex_unlock(&mtx); +} + +int main(int argc, char *argv[]) +{ + int rc = log_init(NAME); + if (rc != EOK) { + fprintf(stderr, "%s: Unable to initialize log\n", NAME); + return rc; + } + + kernel_ctx = log_create("kernel", LOG_NO_PARENT); + for (unsigned int i = 0; i < facility_len; i++) { + facility_ctx[i] = log_create(facility_name[i], kernel_ctx); + } + + buffer = malloc(BUFFER_SIZE); + if (buffer == NULL) { + log_msg(LOG_DEFAULT, LVL_ERROR, "Unable to allocate buffer"); + return 1; + } + + prodcons_initialize(&pc); + async_set_interrupt_received(notification_received); + rc = event_subscribe(EVENT_KLOG, 0); + if (rc != EOK) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Unable to register klog notifications"); + return rc; + } + + fid_t fid = fibril_create(consumer, NULL); + if (!fid) { + log_msg(LOG_DEFAULT, LVL_ERROR, + "Unable to create consumer fibril"); + return ENOMEM; + } + + fibril_add_ready(fid); + event_unmask(EVENT_KLOG); + + fibril_mutex_lock(&mtx); + producer(); + fibril_mutex_unlock(&mtx); + + task_retval(0); + async_manager(); + + return 0; +} + +/** @} + */