Changeset 98e4507 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-05-20T01:13:40Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5c460cc

Parents:

a0bb65af (diff), 326bf65 (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:

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

kernel/generic/src/console/console.c

@@ -53 +53 @@
 #include <str.h>
 
-#define KLOG_PAGES    4
+#define KLOG_PAGES    8
 #define KLOG_LENGTH   (KLOG_PAGES * PAGE_SIZE / sizeof(wchar_t))
-#define KLOG_LATENCY  8
 
 /** Kernel log cyclic 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);
@@ -265 +266 @@
         spinlock_lock(&klog_lock);
         
-        if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) {
-                event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace);
-                klog_uspace = 0;
+        if ((klog_inited) && (klog_uspace > 0)) {
+                if (event_notify_3(EVENT_KLOG, true, klog_start, klog_len,
+                    klog_uspace) == EOK)
+                        klog_uspace = 0;
         }
         
@@ -316 +318 @@
                 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();
 }