Changes in uspace/app/klog/klog.c [d9fae235:6119f24] 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 <sysinfo.h>
+#include <ddi.h>
 #include <event.h>
 #include <errno.h>
+#include <str_error.h>
 #include <io/klog.h>
+#include <sysinfo.h>
 
-#define NAME  "klog"
+#define NAME       "klog"
+#define LOG_FNAME  "/log/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)
@@ -58 +61 @@
         size_t i;
         
-        for (i = klog_len - klog_stored; i < klog_len; i++)
-                putchar(klog[(klog_start + i) % klog_length]);
+        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));
+        }
 }
 
 int main(int argc, char *argv[])
 {
-        size_t klog_pages;
-        if (sysinfo_get_value("klog.pages", &klog_pages) != EOK) {
-                printf("%s: Error getting klog address\n", NAME);
-                return -1;
+        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_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("%s: Error allocating memory area\n", NAME);
-                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;
         }
         
-        int res = async_share_in_start_1_0(PHONE_NS, (void *) klog,
-            klog_size, SERVICE_MEM_KLOG);
-        if (res != EOK) {
-                printf("%s: Error initializing memory area\n", NAME);
-                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;
         }
         
-        if (event_subscribe(EVENT_KLOG, 0) != EOK) {
-                printf("%s: Error registering klog notifications\n", NAME);
-                return -1;
+        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);