Changes in kernel/generic/src/console/console.c [712c4ba:97d42d5] in mainline

File:

• kernel/generic/src/console/console.c (modified) (7 diffs)

kernel/generic/src/console/console.c

@@ -60 +60 @@
 
 /** Kernel log initialized */
-static atomic_t klog_inited = {false};
+static bool klog_inited = false;
 
 /** First kernel log characters */
@@ -75 +75 @@
 
 /** Kernel log spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(klog_lock, "klog_lock");
+SPINLOCK_STATIC_INITIALIZE_NAME(klog_lock, "*klog_lock");
 
 /** Physical memory area used for klog buffer */
@@ -166 +166 @@
         
         event_set_unmask_callback(EVENT_KLOG, klog_update);
-        atomic_set(&klog_inited, true);
+        
+        spinlock_lock(&klog_lock);
+        klog_inited = true;
+        spinlock_unlock(&klog_lock);
 }
 
@@ -261 +264 @@
 void klog_update(void)
 {
-        if (!atomic_get(&klog_inited))
-                return;
-        
         spinlock_lock(&klog_lock);
         
-        if (klog_uspace > 0) {
+        if ((klog_inited) && (klog_uspace > 0)) {
                 if (event_notify_3(EVENT_KLOG, true, klog_start, klog_len,
                     klog_uspace) == EOK)
@@ -277 +277 @@
 void putchar(const wchar_t ch)
 {
-        bool ordy = ((stdout) && (stdout->op->write));
-        
         spinlock_lock(&klog_lock);
         
-        /* Print charaters stored in kernel log */
-        if (ordy) {
-                while (klog_stored > 0) {
-                        wchar_t tmp = klog[(klog_start + klog_len - klog_stored) % KLOG_LENGTH];
-                        klog_stored--;
-                        
-                        /*
-                         * We need to give up the spinlock for
-                         * the physical operation of writting out
-                         * the character.
-                         */
-                        spinlock_unlock(&klog_lock);
-                        stdout->op->write(stdout, tmp, silent);
-                        spinlock_lock(&klog_lock);
-                }
+        if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
+                /* Print charaters stored in kernel log */
+                size_t i;
+                for (i = klog_len - klog_stored; i < klog_len; i++)
+                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_LENGTH], silent);
+                klog_stored = 0;
         }
         
@@ -305 +294 @@
                 klog_start = (klog_start + 1) % KLOG_LENGTH;
         
-        if (!ordy) {
-                if (klog_stored < klog_len)
-                        klog_stored++;
-        }
-        
-        /* The character is stored for uspace */
-        if (klog_uspace < klog_len)
-                klog_uspace++;
-        
-        spinlock_unlock(&klog_lock);
-        
-        if (ordy) {
-                /*
-                 * Output the character. In this case
-                 * it should be no longer buffered.
-                 */
+        if ((stdout) && (stdout->op->write))
                 stdout->op->write(stdout, ch, silent);
-        } else {
+        else {
                 /*
                  * No standard output routine defined yet.
@@ -332 +306 @@
                  * Note that the early_putc() function might be
                  * a no-op on certain hardware configurations.
+                 *
                  */
                 early_putchar(ch);
-        }
+                
+                if (klog_stored < klog_len)
+                        klog_stored++;
+        }
+        
+        /* The character is stored for uspace */
+        if (klog_uspace < klog_len)
+                klog_uspace++;
+        
+        spinlock_unlock(&klog_lock);
         
         /* Force notification on newline */