| 39,20 → 39,23 |
|---|
| #include <synch/waitq.h> |
| #include <synch/spinlock.h> |
| #include <arch/types.h> |
| #include <ddi/device.h> |
| #include <ddi/irq.h> |
| #include <ddi/ddi.h> |
| #include <event/event.h> |
| #include <ipc/irq.h> |
| #include <arch.h> |
| #include <func.h> |
| #include <print.h> |
| #include <putchar.h> |
| #include <atomic.h> |
| #include <syscall/copy.h> |
| #include <errno.h> |
| |
| #define KLOG_SIZE PAGE_SIZE |
| #define KLOG_LATENCY 8 |
| #define KLOG_SIZE PAGE_SIZE |
| #define KLOG_LATENCY 8 |
| |
| /** Kernel log cyclic buffer */ |
| static char klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE))); |
| static wchar_t klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE))); |
| |
| /** Kernel log initialized */ |
| static bool klog_inited = false; |
| 93,18 → 96,12 |
|---|
| ASSERT(KLOG_SIZE % FRAME_SIZE == 0); |
| |
| klog_parea.pbase = (uintptr_t) faddr; |
| klog_parea.frames = SIZE2FRAMES(KLOG_SIZE); |
| klog_parea.frames = SIZE2FRAMES(sizeof(klog)); |
| ddi_parea_register(&klog_parea); |
| |
| sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr); |
| sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(KLOG_SIZE)); |
| sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog))); |
| |
| //irq_initialize(&klog_irq); |
| //klog_irq.devno = devno; |
| //klog_irq.inr = KLOG_VIRT_INR; |
| //klog_irq.claim = klog_claim; |
| //irq_register(&klog_irq); |
| |
| spinlock_lock(&klog_lock); |
| klog_inited = true; |
| spinlock_unlock(&klog_lock); |
| 122,6 → 119,24 |
|---|
| arch_release_console(); |
| } |
| |
| /** Tell kernel to get keyboard/console access again */ |
| unative_t sys_debug_enable_console(void) |
| { |
| #ifdef CONFIG_KCONSOLE |
| grab_console(); |
| return true; |
| #else |
| return false; |
| #endif |
| } |
| |
| /** Tell kernel to relinquish keyboard/console access */ |
| unative_t sys_debug_disable_console(void) |
| { |
| release_console(); |
| return true; |
| } |
| |
| bool check_poll(indev_t *indev) |
| { |
| if (indev == NULL) |
| 223,15 → 238,15 |
|---|
| { |
| spinlock_lock(&klog_lock); |
| |
| // if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) { |
| // ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace); |
| // klog_uspace = 0; |
| // } |
| if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) { |
| event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace); |
| klog_uspace = 0; |
| } |
| |
| spinlock_unlock(&klog_lock); |
| } |
| |
| void putchar(char c) |
| void putchar(const wchar_t ch) |
| { |
| spinlock_lock(&klog_lock); |
| |
| 244,7 → 259,7 |
|---|
| } |
| |
| /* Store character in the cyclic kernel log */ |
| klog[(klog_start + klog_len) % KLOG_SIZE] = c; |
| klog[(klog_start + klog_len) % KLOG_SIZE] = ch; |
| if (klog_len < KLOG_SIZE) |
| klog_len++; |
| else |
| 251,7 → 266,7 |
|---|
| klog_start = (klog_start + 1) % KLOG_SIZE; |
| |
| if ((stdout) && (stdout->op->write)) |
| stdout->op->write(stdout, c, silent); |
| stdout->op->write(stdout, ch, silent); |
| else { |
| /* The character is just in the kernel log */ |
| if (klog_stored < klog_len) |
| 264,7 → 279,7 |
|---|
| |
| /* Check notify uspace to update */ |
| bool update; |
| if ((klog_uspace > KLOG_LATENCY) || (c == '\n')) |
| if ((klog_uspace > KLOG_LATENCY) || (ch == '\n')) |
| update = true; |
| else |
| update = false; |
| 275,5 → 290,38 |
|---|
| klog_update(); |
| } |
| |
| /** Print using kernel facility |
| * |
| * Print to kernel log. |
| * |
| */ |
| unative_t sys_klog(int fd, const void * buf, size_t count) |
| { |
| char *data; |
| int rc; |
| |
| if (count > PAGE_SIZE) |
| return ELIMIT; |
| |
| if (count > 0) { |
| data = (char *) malloc(count + 1, 0); |
| if (!data) |
| return ENOMEM; |
| |
| rc = copy_from_uspace(data, buf, count); |
| if (rc) { |
| free(data); |
| return rc; |
| } |
| data[count] = 0; |
| |
| printf("%s", data); |
| free(data); |
| } else |
| klog_update(); |
| |
| return count; |
| } |
| |
| /** @} |
| */ |