Changes in kernel/generic/src/log/log.c [690ad20:28a5ebd] in mainline

File:

• kernel/generic/src/log/log.c (modified) (10 diffs)

kernel/generic/src/log/log.c

@@ -33 +33 @@
  */
 
-#include <abi/log.h>
-#include <arch.h>
-#include <atomic.h>
-#include <console/console.h>
+#include <sysinfo/sysinfo.h>
+#include <synch/spinlock.h>
+#include <typedefs.h>
+#include <ddi/irq.h>
 #include <ddi/ddi.h>
-#include <ddi/irq.h>
-#include <errno.h>
 #include <ipc/event.h>
 #include <ipc/irq.h>
+#include <arch.h>
+#include <panic.h>
+#include <putchar.h>
+#include <atomic.h>
+#include <syscall/copy.h>
+#include <errno.h>
+#include <str.h>
+#include <print.h>
+#include <printf/printf_core.h>
+#include <stdarg.h>
 #include <log.h>
-#include <panic.h>
-#include <print.h>
-#include <printf_core.h>
-#include <stdarg.h>
+#include <console/console.h>
+#include <abi/log.h>
 #include <stdlib.h>
-#include <str.h>
-#include <synch/spinlock.h>
-#include <syscall/copy.h>
-#include <sysinfo/sysinfo.h>
-#include <typedefs.h>
 
 #define LOG_PAGES    8
@@ -59 +60 @@
 
 /** Cyclic buffer holding the data for kernel log */
-static uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
+uint8_t log_buffer[LOG_LENGTH] __attribute__((aligned(PAGE_SIZE)));
 
 /** Kernel log initialized */
@@ -65 +66 @@
 
 /** Position in the cyclic buffer where the first log entry starts */
-static size_t log_start = 0;
+size_t log_start = 0;
 
 /** Sum of length of all log entries currently stored in the cyclic buffer */
-static size_t log_used = 0;
+size_t log_used = 0;
 
 /** Log spinlock */
-static IRQ_SPINLOCK_INITIALIZE(log_lock);
+SPINLOCK_STATIC_INITIALIZE_NAME(log_lock, "log_lock");
 
 /** Overall count of logged messages, which may overflow as needed */
@@ -150 +151 @@
 void log_begin(log_facility_t fac, log_level_t level)
 {
-        console_lock();
-        irq_spinlock_lock(&log_lock, true);
-        irq_spinlock_lock(&kio_lock, true);
+        spinlock_lock(&log_lock);
+        spinlock_lock(&kio_lock);
 
         log_current_start = (log_start + log_used) % LOG_LENGTH;
@@ -178 +178 @@
         log_used += log_current_len;
 
-        kio_push_bytes("\n", 1);
-        irq_spinlock_unlock(&kio_lock, true);
-        irq_spinlock_unlock(&log_lock, true);
+        kio_push_char('\n');
+        spinlock_unlock(&kio_lock);
+        spinlock_unlock(&log_lock);
 
         /* This has to be called after we released the locks above */
@@ -186 +186 @@
         kio_update(NULL);
         log_update(NULL);
-        console_unlock();
 }
 
@@ -194 +193 @@
                 return;
 
-        irq_spinlock_lock(&log_lock, true);
+        spinlock_lock(&log_lock);
         if (next_for_uspace < log_used)
                 event_notify_0(EVENT_KLOG, true);
-        irq_spinlock_unlock(&log_lock, true);
+        spinlock_unlock(&log_lock);
 }
 
 static int log_printf_str_write(const char *str, size_t size, void *data)
 {
-        kio_push_bytes(str, size);
+        size_t offset = 0;
+        size_t chars = 0;
+
+        while (offset < size) {
+                kio_push_char(str_decode(str, &offset, size));
+                chars++;
+        }
+
         log_append((const uint8_t *)str, size);
-        return EOK;
+
+        return chars;
+}
+
+static int log_printf_wstr_write(const char32_t *wstr, size_t size, void *data)
+{
+        char buffer[16];
+        size_t offset = 0;
+        size_t chars = 0;
+
+        for (offset = 0; offset < size; offset += sizeof(char32_t), chars++) {
+                kio_push_char(wstr[chars]);
+
+                size_t buffer_offset = 0;
+                errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
+                if (rc != EOK) {
+                        return EOF;
+                }
+
+                log_append((const uint8_t *)buffer, buffer_offset);
+        }
+
+        return chars;
 }
 
@@ -213 +241 @@
 int log_vprintf(const char *fmt, va_list args)
 {
+        int ret;
+
         printf_spec_t ps = {
                 log_printf_str_write,
+                log_printf_wstr_write,
                 NULL
         };
 
-        return printf_core(fmt, &ps, args);
+        ret = printf_core(fmt, &ps, args);
+
+        return ret;
 }
 
@@ -301 +334 @@
                 rc = EOK;
 
-                irq_spinlock_lock(&log_lock, true);
+                spinlock_lock(&log_lock);
 
                 while (next_for_uspace < log_used) {
@@ -331 +364 @@
                 }
 
-                irq_spinlock_unlock(&log_lock, true);
+                spinlock_unlock(&log_lock);
 
                 if (rc != EOK) {