Changeset 0496c17 in mainline

Timestamp:

2011-05-16T19:58:02Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d8a304

Parents:

bec0219

Message:

Allow events to define unmask callback. Make klog_update() the unmask
callback for KLOG_EVENT. This makes sure that klog receives all data
from the kernel console even after the kernel stops printing.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/event.h

@@ -53 +53 @@
         /** Masked flag. */
         bool masked;
+        /** Unmask callback. */
+        void (*unmask_cb)(void);
 } 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));
 
 #define event_notify_0(e, m) \

kernel/generic/src/console/console.c

@@ -165 +165 @@
         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);

kernel/generic/src/ipc/event.c

@@ -59 +59 @@
                 events[i].imethod = 0;
                 events[i].masked = false;
+                events[i].unmask_cb = NULL;
         }
 }
@@ -83 +84 @@
 }
 
+/** 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;
+        spinlock_unlock(&events[evno].lock);
+}
+
 /** Send kernel notification event
  *
@@ -190 +206 @@
 static void event_unmask(event_type_t evno)
 {
+        void (*cb)(void);
         ASSERT(evno < EVENT_END);
         
         spinlock_lock(&events[evno].lock);
         events[evno].masked = false;
-        spinlock_unlock(&events[evno].lock);
+        cb = events[evno].unmask_cb;
+        spinlock_unlock(&events[evno].lock);
+        
+        /*
+         * Check if there is an unmask callback function defined for this event.
+         */
+        if (cb)
+            cb();
 }