Changes in uspace/app/klog/klog.c [6119f24:1ea99cc] in mainline

File:

• uspace/app/klog/klog.c (modified) (2 diffs)

uspace/app/klog/klog.c

@@ -36 +36 @@
 
 #include <stdio.h>
+#include <ipc/ipc.h>
 #include <async.h>
+#include <ipc/services.h>
 #include <as.h>
-#include <ddi.h>
+#include <sysinfo.h>
 #include <event.h>
 #include <errno.h>
-#include <str_error.h>
 #include <io/klog.h>
-#include <sysinfo.h>
 
-#define NAME       "klog"
-#define LOG_FNAME  "/log/klog"
+#define NAME  "klog"
 
 /* Pointer to klog area */
 static wchar_t *klog;
 static size_t klog_length;
-
-static FILE *log;
 
 static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
@@ -61 +58 @@
         size_t i;
         
-        for (i = klog_len - klog_stored; i < klog_len; i++) {
-                wchar_t ch = klog[(klog_start + i) % klog_length];
-                
-                putchar(ch);
-                
-                if (log != NULL)
-                        fputc(ch, log);
-        }
-        
-        if (log != NULL) {
-                fflush(log);
-                fsync(fileno(log));
-        }
+        for (i = klog_len - klog_stored; i < klog_len; i++)
+                putchar(klog[(klog_start + i) % klog_length]);
 }
 
 int main(int argc, char *argv[])
 {
-        size_t pages;
-        int rc = sysinfo_get_value("klog.pages", &pages);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to get number of klog pages\n",
-                    NAME);
-                return rc;
+        size_t klog_pages = sysinfo_value("klog.pages");
+        size_t klog_size = klog_pages * PAGE_SIZE;
+        klog_length = klog_size / sizeof(wchar_t);
+        
+        klog = (wchar_t *) as_get_mappable_page(klog_size);
+        if (klog == NULL) {
+                printf(NAME ": Error allocating memory area\n");
+                return -1;
+        }
+
+        printf("got area at 0x%08lx, length %lx byes\n", klog, klog_size);
+        
+        int res = ipc_share_in_start_1_0(PHONE_NS, (void *) klog,
+            klog_size, SERVICE_MEM_KLOG);
+        if (res != EOK) {
+                printf(NAME ": Error initializing memory area\n");
+                return -1;
         }
         
-        uintptr_t faddr;
-        rc = sysinfo_get_value("klog.faddr", &faddr);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to get klog physical address\n",
-                    NAME);
-                return rc;
+        if (event_subscribe(EVENT_KLOG, 0) != EOK) {
+                printf(NAME ": Error registering klog notifications\n");
+                return -1;
         }
-        
-        size_t size = pages * PAGE_SIZE;
-        klog_length = size / sizeof(wchar_t);
-        
-        klog = (wchar_t *) as_get_mappable_page(size);
-        if (klog == NULL) {
-                fprintf(stderr, "%s: Unable to allocate virtual memory area\n",
-                    NAME);
-                return ENOMEM;
-        }
-        
-        rc = physmem_map((void *) faddr, (void *) klog, pages,
-            AS_AREA_READ | AS_AREA_CACHEABLE);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to map klog\n", NAME);
-                return rc;
-        }
-        
-        rc = event_subscribe(EVENT_KLOG, 0);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Unable to register klog notifications\n",
-                    NAME);
-                return rc;
-        }
-        
-        /*
-         * Mode "a" would be definitively much better here, but it is
-         * not well supported by the FAT driver.
-         */
-        log = fopen(LOG_FNAME, "w");
-        if (log == NULL)
-                printf("%s: Unable to create log file %s (%s)\n", NAME, LOG_FNAME,
-                    str_error(errno));
         
         async_set_interrupt_received(interrupt_received);