WebSVN – HelenOS – Diff – /branches/tracing/kernel/generic/src/console/console.c

 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
 #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 <ipc/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>
+#include <string.h>
+#define KLOG_PAGES    4
+#define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
+#define KLOG_LATENCY  8
-#define KLOG_SIZE PAGE_SIZE
+/** Kernel log cyclic buffer */
-#define KLOG_LATENCY 8
+static wchar_t klog[KLOG_LENGTH] __attribute__ ((aligned (PAGE_SIZE)));
-/**< Kernel log cyclic buffer */
-static char klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
-/**< Kernel log initialized */
+/** Kernel log initialized */
 static bool klog_inited = false;
-/**< First kernel log characters */
+/** First kernel log characters */
 static index_t klog_start = 0;
-/**< Number of valid kernel log characters */
+/** Number of valid kernel log characters */
 static size_t klog_len = 0;
-/**< Number of stored (not printed) kernel log characters */
+/** Number of stored (not printed) kernel log characters */
 static size_t klog_stored = 0;
-/**< Number of stored kernel log characters for uspace */
+/** Number of stored kernel log characters for uspace */
 static size_t klog_uspace = 0;
-/**< Kernel log spinlock */
+/** Kernel log spinlock */
 SPINLOCK_INITIALIZE(klog_lock);
 /** Physical memory area used for klog buffer */
 static parea_t klog_parea;
-/*
- * For now, we use 0 as INR.
- * However, it is therefore desirable to have architecture specific
- * definition of KLOG_VIRT_INR in the future.
- */
-#define KLOG_VIRT_INR   0
-static irq_t klog_irq;
-static chardev_operations_t null_stdout_ops = {
+static indev_operations_t stdin_ops = {
-    .suspend = NULL,
-    .resume = NULL,
-    .write = NULL,
-    .read = NULL
+    .poll = NULL
 };
-chardev_t null_stdout = {
+/** Silence output */
-    .name = "null",
+bool silent = false;
-    .op = &null_stdout_ops
-};
-/** Allways refuse IRQ ownership.
+/** Standard input and output character devices */
- *
- * This is not a real IRQ, so we always decline.
+indev_t *stdin = NULL;
- *
- * @return Always returns IRQ_DECLINE.
+outdev_t *stdout = NULL;
- */
-static irq_ownership_t klog_claim(void)
+indev_t *stdin_wire(void)
+{
+    if (stdin == NULL) {
+        stdin = malloc(sizeof(indev_t), FRAME_ATOMIC);
+        if (stdin != NULL)
+            indev_initialize("stdin", stdin, &stdin_ops);
+    }
-    return IRQ_DECLINE;
+    return stdin;
+}
-/** Standard input character device */
-chardev_t *stdin = NULL;
-chardev_t *stdout = &null_stdout;
 /** Initialize kernel logging facility
+ *
  * The shared area contains kernel cyclic buffer. Userspace application may
  * be notified on new data with indication of position and size
  * of the data within the circular buffer.
+ *
  */
 void klog_init(void)
+{
     void *faddr = (void *) KA2PA(klog);
     ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
-    ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
-    devno_t devno = device_assign_devno();
     klog_parea.pbase = (uintptr_t) faddr;
-    klog_parea.vbase = (uintptr_t) klog;
-    klog_parea.frames = SIZE2FRAMES(KLOG_SIZE);
+    klog_parea.frames = SIZE2FRAMES(sizeof(klog));
-    klog_parea.cacheable = true;
     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.devno", NULL, devno);
-    sysinfo_set_item_val("klog.inr", NULL, KLOG_VIRT_INR);
+    sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
-    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);
+}
-/** Get character from character device. Do not echo character.
- *
- * @param chardev Character device.
- *
- * @return Character read.
+void grab_console(void)
- */
-uint8_t _getc(chardev_t *chardev)
+{
-    uint8_t ch;
-    ipl_t ipl;
+    bool prev = silent;
-    if (atomic_get(&haltstate)) {
+    silent = false;
-        /* If we are here, we are hopefully on the processor, that
-         * issued the 'halt' command, so proceed to read the character
-         * directly from input
+    arch_grab_console();
-         */
-        if (chardev->op->read)
-            return chardev->op->read(chardev);
-        /* no other way of interacting with user, halt */
+    /* Force the console to print the prompt */
-        if (CPU)
-            printf("cpu%u: ", CPU->id);
-        else
-            printf("cpu: ");
+    if ((stdin) && (prev))
-        printf("halted - no kconsole\n");
+        indev_push_character(stdin, '\n');
-        cpu_halt();
-    }
+}
-    waitq_sleep(&chardev->wq);
+void release_console(void)
-    ipl = interrupts_disable();
-    spinlock_lock(&chardev->lock);
-    ch = chardev->buffer[(chardev->index - chardev->counter) % CHARDEV_BUFLEN];
+{
-    chardev->counter--;
+    silent = true;
-    spinlock_unlock(&chardev->lock);
-    interrupts_restore(ipl);
+    arch_release_console();
+}
+/** Tell kernel to get keyboard/console access again */
+unative_t sys_debug_enable_console(void)
+{
+#ifdef CONFIG_KCONSOLE
-    chardev->op->resume(chardev);
+    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 ch;
+    return true;
+}
-/** Get string from character device.
+/** Get string from input character device.
+ *
- * Read characters from character device until first occurrence
+ * Read characters from input character device until first occurrence
  * of newline character.
+ *
- * @param chardev Character device.
+ * @param indev  Input character device.
- * @param buf Buffer where to store string terminated by '\0'.
+ * @param buf    Buffer where to store string terminated by NULL.
  * @param buflen Size of the buffer.
+ *
  * @return Number of characters read.
+ *
  */
-count_t gets(chardev_t *chardev, char *buf, size_t buflen)
+count_t gets(indev_t *indev, char *buf, size_t buflen)
+{
-    index_t index = 0;
+    size_t offset = 0;
-    char ch;
+    count_t count = 0;
+    buf[offset] = 0;
-    while (index < buflen) {
+    wchar_t ch;
-        ch = _getc(chardev);
+    while ((ch = indev_pop_character(indev)) != '\n') {
         if (ch == '\b') {
-            if (index > 0) {
+            if (count > 0) {
-                index--;
-                /* Space backspace, space */
+                /* Space, backspace, space */
                 putchar('\b');
                 putchar(' ');
                 putchar('\b');
+                count--;
+                offset = str_lsize(buf, count);
+                buf[offset] = 0;
+            }
-            continue;
-        }
-        putchar(ch);
-        if (ch == '\n') { /* end of string => write 0, return */
-            buf[index] = '\0';
-            return (count_t) index;
+        }
+        if (chr_encode(ch, buf, &offset, buflen - 1) == EOK) {
+            putchar(ch);
+            count++;
-        buf[index++] = ch;
+            buf[offset] = 0;
+        }
+    }
-    return (count_t) index;
+    return count;
+}
-/** Get character from device & echo it to screen */
+/** Get character from input device & echo it to screen */
-uint8_t getc(chardev_t *chardev)
+wchar_t getc(indev_t *indev)
+{
-    uint8_t ch;
-    ch = _getc(chardev);
+    wchar_t ch = indev_pop_character(indev);
     putchar(ch);
     return ch;
+}
 void klog_update(void)
+{
     spinlock_lock(&klog_lock);
-    if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) {
+    if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) {
-        ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace);
+        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);
-    if ((klog_stored > 0) && (stdout->op->write)) {
+    if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
         /* Print charaters stored in kernel log */
         index_t i;
         for (i = klog_len - klog_stored; i < klog_len; i++)
-            stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE]);
+            stdout->op->write(stdout, klog[(klog_start + i) % KLOG_LENGTH], silent);
         klog_stored = 0;
+    }
     /* Store character in the cyclic kernel log */
-    klog[(klog_start + klog_len) % KLOG_SIZE] = c;
+    klog[(klog_start + klog_len) % KLOG_LENGTH] = ch;
-    if (klog_len < KLOG_SIZE)
+    if (klog_len < KLOG_LENGTH)
         klog_len++;
     else
-        klog_start = (klog_start + 1) % KLOG_SIZE;
+        klog_start = (klog_start + 1) % KLOG_LENGTH;
-    if (stdout->op->write)
+    if ((stdout) && (stdout->op->write))
-        stdout->op->write(stdout, c);
+        stdout->op->write(stdout, ch, silent);
     else {
         /* The character is just in the kernel log */
         if (klog_stored < klog_len)
             klog_stored++;
+    }
     if (klog_uspace < klog_len)
         klog_uspace++;
     /* 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;
     spinlock_unlock(&klog_lock);
     if (update)
         klog_update();
+}
+/** Print using kernel facility
+ *
+ * Print to kernel log.
+ *
+ */
+unative_t sys_klog(int fd, const void *buf, size_t size)
+{
+    char *data;
+    int rc;
+    if (size > PAGE_SIZE)
+        return ELIMIT;
+    if (size > 0) {
+        data = (char *) malloc(size + 1, 0);
+        if (!data)
+            return ENOMEM;
+        rc = copy_from_uspace(data, buf, size);
+        if (rc) {
+            free(data);
+            return rc;
+        }
+        data[size] = 0;
+        printf("%s", data);
+        free(data);
+    } else
+        klog_update();
+    return size;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/generic/src/console/console.c @ 4692 – Rev 3424 → 4377