Changes in kernel/generic/src/ipc/kbox.c [716185d:1066041] in mainline

File:

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

kernel/generic/src/ipc/kbox.c

@@ -44 +44 @@
 #include <ipc/kbox.h>
 #include <print.h>
+#include <proc/thread.h>
 
 void ipc_kbox_cleanup(void)
 {
-        /*
-         * Not really needed, just to be consistent with the meaning of
-         * answerbox_t.active.
-         */
-        irq_spinlock_lock(&TASK->kb.box.lock, true);
-        TASK->kb.box.active = false;
-        irq_spinlock_unlock(&TASK->kb.box.lock, true);
-
         /*
          * Only hold kb.cleanup_lock while setting kb.finished -
@@ -96 +89 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues. */
-        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
-        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.dispatched_calls);
+        irq_spinlock_lock(&TASK->kb.box.lock, true);
+        ipc_cleanup_call_list(&TASK->kb.box.dispatched_calls);
+        ipc_cleanup_call_list(&TASK->kb.box.calls);
+        irq_spinlock_unlock(&TASK->kb.box.lock, true);
 }
 
@@ -168 +163 @@
         while (!done) {
                 call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT,
-                    SYNCH_FLAGS_NONE);
+                        SYNCH_FLAGS_NONE);
                 
                 if (call == NULL)
@@ -242 +237 @@
         
         /* Connect the newly allocated phone to the kbox */
-        (void) ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
+        ipc_phone_connect(&TASK->phones[newphid], &task->kb.box);
         
         if (task->kb.thread != NULL) {