Changeset 46c20c8 in mainline for uspace/app/klog/klog.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/app/klog/klog.c

@@ -43 +43 @@
 #include <event.h>
 #include <errno.h>
+#include <str_error.h>
 #include <io/klog.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 +62 @@
         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 = sysinfo_value("klog.pages");
+        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 klog_size = klog_pages * PAGE_SIZE;
         klog_length = klog_size / sizeof(wchar_t);
@@ -70 +90 @@
         klog = (wchar_t *) as_get_mappable_page(klog_size);
         if (klog == NULL) {
-                printf(NAME ": Error allocating memory area\n");
+                printf("%s: Error allocating memory area\n", NAME);
                 return -1;
         }
@@ -77 +97 @@
             klog_size, SERVICE_MEM_KLOG);
         if (res != EOK) {
-                printf(NAME ": Error initializing memory area\n");
+                printf("%s: Error initializing memory area\n", NAME);
                 return -1;
         }
         
         if (event_subscribe(EVENT_KLOG, 0) != EOK) {
-                printf(NAME ": Error registering klog notifications\n");
+                printf("%s: Error registering klog notifications\n", NAME);
                 return -1;
         }
+        
+        /*
+         * 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);