Changeset 1c03c17 in mainline

Timestamp:

2008-06-06T23:16:37Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c05a50f

Parents:

b7b6753

Message:

uspace klog

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• app/klog/klog.c (modified) (3 diffs)
• lib/libc/generic/io/stream.c (modified) (2 diffs)
• lib/libc/include/io/stream.h (modified) (1 diff)
• lib/libc/include/stdio.h (modified) (1 diff)

uspace/app/init/init.c

@@ -131 +131 @@
         spawn("/sbin/tetris");
         // FIXME: spawn("/sbin/tester");
-        // FIXME: spawn("/sbin/klog");
+        spawn("/sbin/klog");
         
         free(buf);

uspace/app/klog/klog.c

@@ -41 +41 @@
 #include <as.h>
 #include <sysinfo.h>
+#include <io/stream.h>
+#include <errno.h>
+
+#define NAME "klog"
+
+#define KLOG_SIZE PAGE_SIZE
 
 /* Pointer to klog area */
@@ -47 +53 @@
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
 {
-        int i;
+        async_serialize_start();
         
-        async_serialize_start();
-        for (i=0; klog[i + IPC_GET_ARG1(*call)] && i < IPC_GET_ARG2(*call); i++)
-                putchar(klog[i + IPC_GET_ARG1(*call)]);
-        putchar('\n');
+        size_t klog_start = (size_t) IPC_GET_ARG1(*call);
+        size_t klog_len = (size_t) IPC_GET_ARG2(*call);
+        size_t klog_stored = (size_t) IPC_GET_ARG3(*call);
+        size_t i;
+        for (i = klog_len - klog_stored; i < klog_len; i++)
+                putchar(klog[(klog_start + i) % KLOG_SIZE]);
+        
         async_serialize_end();
 }
@@ -58 +67 @@
 int main(int argc, char *argv[])
 {
-        int res;
-        void *mapping;
-
-        printf("Kernel console output.\n");
+        klog = (char *) as_get_mappable_page(KLOG_SIZE);
+        if (klog == NULL) {
+                printf(NAME ": Error allocating memory area\n");
+                return -1;
+        }
         
-        mapping = as_get_mappable_page(PAGE_SIZE);
-        res = ipc_share_in_start_1_0(PHONE_NS, mapping, PAGE_SIZE,
+        int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog, KLOG_SIZE,
             SERVICE_MEM_KLOG);
-        if (res) {
-                printf("Failed to initialize klog memarea\n");
-                _exit(1);
+        if (res != EOK) {
+                printf(NAME ": Error initializing memory area\n");
+                return -1;
         }
-        klog = mapping;
 
         int inr = sysinfo_value("klog.inr");
         int devno = sysinfo_value("klog.devno");
-        if (ipc_register_irq(inr, devno, 0, NULL)) {
-                printf("Error registering for klog service.\n");
-                return 0;
+        if (ipc_register_irq(inr, devno, 0, NULL) != EOK) {
+                printf(NAME ": Error registering klog notifications\n");
+                return -1;
         }
-
+        
         async_set_interrupt_received(interrupt_received);
-
+        klog_update();
         async_manager();
 

uspace/lib/libc/generic/io/stream.c

@@ -83 +83 @@
                 return count;
         } else
-                return __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, count);
+                return __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, count);
 }
 
@@ -95 +95 @@
 }
 
+void klog_update(void)
+{
+        (void) __SYSCALL3(SYS_KLOG, 1, NULL, 0);
+}
+
 int get_cons_phone(void)
 {

uspace/lib/libc/include/io/stream.h

@@ -41 +41 @@
 
 extern void open_console(void);
+extern void klog_update(void);
 
 extern ssize_t read_stdin(void *, size_t);

uspace/lib/libc/include/stdio.h

@@ -50 +50 @@
         n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
         if (n > 0) \
-                (void) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, strlen(buf)); \
+                (void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, strlen(buf)); \
 }