Changeset df29f24 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-06-01T09:04:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

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

kernel/generic/src/console/console.c

@@ -55 +55 @@
 #define KLOG_PAGES    8
 #define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
-#define KLOG_LATENCY  8
 
 /** Kernel log cyclic buffer */
@@ -61 +60 @@
 
 /** Kernel log initialized */
-static bool klog_inited = false;
+static atomic_t klog_inited = {false};
 
 /** First kernel log characters */
@@ -76 +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 */
@@ -165 +164 @@
         sysinfo_set_item_val("klog.faddr", NULL, (sysarg_t) faddr);
         sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
-
+        
         event_set_unmask_callback(EVENT_KLOG, klog_update);
-        
-        spinlock_lock(&klog_lock);
-        klog_inited = true;
-        spinlock_unlock(&klog_lock);
+        atomic_set(&klog_inited, true);
 }
 
@@ -265 +261 @@
 void klog_update(void)
 {
+        if (!atomic_get(&klog_inited))
+                return;
+        
         spinlock_lock(&klog_lock);
         
-        if ((klog_inited) && (klog_uspace > 0)) {
+        if (klog_uspace > 0) {
                 if (event_notify_3(EVENT_KLOG, true, klog_start, klog_len,
                     klog_uspace) == EOK)
@@ -278 +277 @@
 void putchar(const wchar_t ch)
 {
+        bool ordy = ((stdout) && (stdout->op->write));
+        
         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;
+        /* 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);
+                }
         }
         
@@ -295 +305 @@
                 klog_start = (klog_start + 1) % KLOG_LENGTH;
         
-        if ((stdout) && (stdout->op->write))
+        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.
+                 */
                 stdout->op->write(stdout, ch, silent);
-        else {
+        } else {
                 /*
                  * No standard output routine defined yet.
@@ -307 +332 @@
                  * 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++;
-        
-        /* Check notify uspace to update */
-        bool update;
-        if ((klog_uspace > KLOG_LATENCY) || (ch == '\n'))
-                update = true;
-        else
-                update = false;
-        
-        spinlock_unlock(&klog_lock);
-        
-        if (update)
+        }
+        
+        /* Force notification on newline */
+        if (ch == '\n')
                 klog_update();
 }