Changeset 97d42d5 in mainline

Timestamp:

2011-05-17T15:10:16Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0a02653

Parents:

0d8a304

Message:

get rid of KLOG_LATENCY (thanks to the event notification unmask callback this is no longer needed)

Location:

kernel/generic

Files:

• include/ipc/event.h (modified) (2 diffs)
• src/console/console.c (modified) (3 diffs)
• src/ipc/event.c (modified) (3 diffs)

kernel/generic/include/ipc/event.h

@@ -41 +41 @@
 #include <ipc/ipc.h>
 
+typedef void (*event_callback_t)(void);
+
 /** Event notification structure. */
 typedef struct {
@@ -51 +53 @@
         /** Counter. */
         size_t counter;
+        
         /** Masked flag. */
         bool masked;
         /** Unmask callback. */
-        void (*unmask_cb)(void);
+        event_callback_t unmask_callback;
 } event_t;
 
 extern void event_init(void);
 extern void event_cleanup_answerbox(answerbox_t *);
-extern void event_set_unmask_callback(event_type_t, void (*)(void));
+extern void event_set_unmask_callback(event_type_t, event_callback_t);
 
 #define event_notify_0(e, m) \

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 */
@@ -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);
         
@@ -319 +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();
 }

kernel/generic/src/ipc/event.c

@@ -59 +59 @@
                 events[i].imethod = 0;
                 events[i].masked = false;
-                events[i].unmask_cb = NULL;
+                events[i].unmask_callback = NULL;
         }
 }
@@ -86 +86 @@
 /** Define a callback function for the event unmask event.
  *
- * @param evno Event type.
- * @param cb   Callback function to be called when the event is unmasked.
- *
- */
-void event_set_unmask_callback(event_type_t evno, void (*cb)(void))
-{
-        ASSERT(evno < EVENT_END);
-        
-        spinlock_lock(&events[evno].lock);
-        events[evno].unmask_cb = cb;
+ * @param evno     Event type.
+ * @param callback Callback function to be called when
+ *                 the event is unmasked.
+ *
+ */
+void event_set_unmask_callback(event_type_t evno, event_callback_t callback)
+{
+        ASSERT(evno < EVENT_END);
+        
+        spinlock_lock(&events[evno].lock);
+        events[evno].unmask_callback = callback;
         spinlock_unlock(&events[evno].lock);
 }
@@ -206 +207 @@
 static void event_unmask(event_type_t evno)
 {
-        void (*cb)(void);
         ASSERT(evno < EVENT_END);
         
         spinlock_lock(&events[evno].lock);
         events[evno].masked = false;
-        cb = events[evno].unmask_cb;
+        event_callback_t callback = events[evno].unmask_callback;
         spinlock_unlock(&events[evno].lock);
         
         /*
-         * Check if there is an unmask callback function defined for this event.
+         * Check if there is an unmask callback
+         * function defined for this event.
          */
-        if (cb)
-            cb();
+        if (callback != NULL)
+                callback();
 }