Changes in kernel/generic/src/ipc/ipc.c [ab34cc9:79ae36dd] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -38 +38 @@
  */
 
+#include <synch/synch.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
 #include <synch/waitq.h>
+#include <synch/synch.h>
 #include <ipc/ipc.h>
-#include <abi/ipc/methods.h>
+#include <ipc/ipc_methods.h>
 #include <ipc/kbox.h>
 #include <ipc/event.h>
@@ -126 +128 @@
         list_initialize(&box->answers);
         list_initialize(&box->irq_notifs);
-        list_initialize(&box->irq_list);
+        list_initialize(&box->irq_head);
         box->task = task;
 }
@@ -181 +183 @@
          */
         irq_spinlock_lock(&TASK->lock, true);
-        list_append(&sync_box->sync_box_link, &TASK->sync_boxes);
+        list_append(&sync_box->sync_box_link, &TASK->sync_box_head);
         irq_spinlock_unlock(&TASK->lock, true);
         
@@ -230 +232 @@
                 }
         }
-
-        call->data.task_id = TASK->taskid;
         
         if (do_lock)
@@ -296 +296 @@
                 atomic_inc(&phone->active_calls);
                 call->data.phone = phone;
-                call->data.task_id = TASK->taskid;
+                call->data.task = TASK;
         }
         
@@ -408 +408 @@
                         call->caller_phone = call->data.phone;
                 call->data.phone = newphone;
-                call->data.task_id = TASK->taskid;
+                call->data.task = TASK;
         }
         
@@ -450 +450 @@
                 irq_spinlock_lock(&box->irq_lock, false);
                 
-                request = list_get_instance(list_first(&box->irq_notifs),
-                    call_t, link);
+                request = list_get_instance(box->irq_notifs.next, call_t, link);
                 list_remove(&request->link);
                 
@@ -460 +459 @@
                 
                 /* Handle asynchronous answers */
-                request = list_get_instance(list_first(&box->answers),
-                    call_t, link);
+                request = list_get_instance(box->answers.next, call_t, link);
                 list_remove(&request->link);
                 atomic_dec(&request->data.phone->active_calls);
@@ -469 +467 @@
                 
                 /* Handle requests */
-                request = list_get_instance(list_first(&box->calls),
-                    call_t, link);
+                request = list_get_instance(box->calls.next, call_t, link);
                 list_remove(&request->link);
                 
@@ -497 +494 @@
  *
  */
-void ipc_cleanup_call_list(list_t *lst)
+void ipc_cleanup_call_list(link_t *lst)
 {
         while (!list_empty(lst)) {
-                call_t *call = list_get_instance(list_first(lst), call_t, link);
+                call_t *call = list_get_instance(lst->next, call_t, link);
                 if (call->buffer)
                         free(call->buffer);
@@ -529 +526 @@
         irq_spinlock_lock(&box->lock, true);
         while (!list_empty(&box->connected_phones)) {
-                phone = list_get_instance(list_first(&box->connected_phones),
+                phone = list_get_instance(box->connected_phones.next,
                     phone_t, link);
                 if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
@@ -609 +606 @@
         /* Wait for all answers to interrupted synchronous calls to arrive */
         ipl_t ipl = interrupts_disable();
-        while (!list_empty(&TASK->sync_boxes)) {
-                answerbox_t *box = list_get_instance(
-                    list_first(&TASK->sync_boxes), answerbox_t, sync_box_link);
+        while (!list_empty(&TASK->sync_box_head)) {
+                answerbox_t *box = list_get_instance(TASK->sync_box_head.next,
+                    answerbox_t, sync_box_link);
                 
                 list_remove(&box->sync_box_link);
@@ -746 +743 @@
 #endif
         
+        link_t *cur;
+        
         printf(" --- incomming calls ---\n");
-        list_foreach(task->answerbox.calls, cur) {
+        for (cur = task->answerbox.calls.next; cur != &task->answerbox.calls;
+            cur = cur->next) {
                 call_t *call = list_get_instance(cur, call_t, link);
                 
@@ -767 +767 @@
         
         printf(" --- dispatched calls ---\n");
-        list_foreach(task->answerbox.dispatched_calls, cur) {
+        for (cur = task->answerbox.dispatched_calls.next;
+            cur != &task->answerbox.dispatched_calls;
+            cur = cur->next) {
                 call_t *call = list_get_instance(cur, call_t, link);
                 
@@ -787 +789 @@
         
         printf(" --- incoming answers ---\n");
-        list_foreach(task->answerbox.answers, cur) {
+        for (cur = task->answerbox.answers.next;
+            cur != &task->answerbox.answers;
+            cur = cur->next) {
                 call_t *call = list_get_instance(cur, call_t, link);