Changeset cfaa35a in mainline

Timestamp:

2012-08-13T09:52:09Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

86939b1

Parents:

cd529c4

Message:

Rename call_t's link to ab_link as this link is exclusively used for
linking the call into one of the answerbox lists.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/event.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (11 diffs)
• src/ipc/ipcrsc.c (modified) (1 diff)
• src/ipc/irq.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -106 +106 @@
 
 typedef struct {
-        link_t link;
+        /** Answerbox link. */
+        link_t ab_link;
         
         unsigned int flags;

kernel/generic/src/ipc/event.c

@@ -163 +163 @@
                                 call->data.task_id = TASK ? TASK->taskid : 0;
                                 
-                                irq_spinlock_lock(&event->answerbox->irq_lock, true);
-                                list_append(&call->link, &event->answerbox->irq_notifs);
-                                irq_spinlock_unlock(&event->answerbox->irq_lock, true);
-                                
-                                waitq_wakeup(&event->answerbox->wq, WAKEUP_FIRST);
+                                irq_spinlock_lock(&event->answerbox->irq_lock,
+                                    true);
+                                list_append(&call->ab_link,
+                                    &event->answerbox->irq_notifs);
+                                irq_spinlock_unlock(&event->answerbox->irq_lock,
+                                    true);
+                                
+                                waitq_wakeup(&event->answerbox->wq,
+                                    WAKEUP_FIRST);
                                 
                                 if (mask)

kernel/generic/src/ipc/ipc.c

@@ -191 +191 @@
                 irq_spinlock_lock(&callerbox->lock, true);
         
-        list_append(&call->link, &callerbox->answers);
+        list_append(&call->ab_link, &callerbox->answers);
         
         if (do_lock)
@@ -209 +209 @@
         /* Remove from active box */
         irq_spinlock_lock(&box->lock, true);
-        list_remove(&call->link);
+        list_remove(&call->ab_link);
         irq_spinlock_unlock(&box->lock, true);
         
@@ -255 +255 @@
         
         irq_spinlock_lock(&box->lock, true);
-        list_append(&call->link, &box->calls);
+        list_append(&call->ab_link, &box->calls);
         irq_spinlock_unlock(&box->lock, true);
         
@@ -356 +356 @@
         TASK->ipc_info.forwarded++;
         irq_spinlock_pass(&TASK->lock, &oldbox->lock);
-        list_remove(&call->link);
+        list_remove(&call->ab_link);
         irq_spinlock_unlock(&oldbox->lock, true);
         
@@ -406 +406 @@
                 
                 request = list_get_instance(list_first(&box->irq_notifs),
-                    call_t, link);
-                list_remove(&request->link);
+                    call_t, ab_link);
+                list_remove(&request->ab_link);
                 
                 irq_spinlock_unlock(&box->irq_lock, false);
@@ -416 +416 @@
                 /* Handle asynchronous answers */
                 request = list_get_instance(list_first(&box->answers),
-                    call_t, link);
-                list_remove(&request->link);
+                    call_t, ab_link);
+                list_remove(&request->ab_link);
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
@@ -425 +425 @@
                 /* Handle requests */
                 request = list_get_instance(list_first(&box->calls),
-                    call_t, link);
-                list_remove(&request->link);
+                    call_t, ab_link);
+                list_remove(&request->ab_link);
                 
                 /* Append request to dispatch queue */
-                list_append(&request->link, &box->dispatched_calls);
+                list_append(&request->ab_link, &box->dispatched_calls);
         } else {
                 /* This can happen regularly after ipc_cleanup */
@@ -455 +455 @@
 {
         while (!list_empty(lst)) {
-                call_t *call = list_get_instance(list_first(lst), call_t, link);
+                call_t *call = list_get_instance(list_first(lst), call_t,
+                    ab_link);
                 if (call->buffer)
                         free(call->buffer);
                 
-                list_remove(&call->link);
+                list_remove(&call->ab_link);
                 
                 IPC_SET_RETVAL(call->data, EHANGUP);
@@ -689 +690 @@
         printf(" --- incomming calls ---\n");
         list_foreach(task->answerbox.calls, cur) {
-                call_t *call = list_get_instance(cur, call_t, link);
+                call_t *call = list_get_instance(cur, call_t, ab_link);
                 
 #ifdef __32_BITS__
@@ -709 +710 @@
         printf(" --- dispatched calls ---\n");
         list_foreach(task->answerbox.dispatched_calls, cur) {
-                call_t *call = list_get_instance(cur, call_t, link);
+                call_t *call = list_get_instance(cur, call_t, ab_link);
                 
 #ifdef __32_BITS__
@@ -729 +730 @@
         printf(" --- incoming answers ---\n");
         list_foreach(task->answerbox.answers, cur) {
-                call_t *call = list_get_instance(cur, call_t, link);
+                call_t *call = list_get_instance(cur, call_t, ab_link);
                 
 #ifdef __32_BITS__

kernel/generic/src/ipc/ipcrsc.c

@@ -151 +151 @@
         
         list_foreach(TASK->answerbox.dispatched_calls, lst) {
-                call_t *call = list_get_instance(lst, call_t, link);
+                call_t *call = list_get_instance(lst, call_t, ab_link);
                 if ((sysarg_t) call == callid) {
                         result = call;

kernel/generic/src/ipc/irq.c

@@ -510 +510 @@
 {
         irq_spinlock_lock(&irq->notif_cfg.answerbox->irq_lock, false);
-        list_append(&call->link, &irq->notif_cfg.answerbox->irq_notifs);
+        list_append(&call->ab_link, &irq->notif_cfg.answerbox->irq_notifs);
         irq_spinlock_unlock(&irq->notif_cfg.answerbox->irq_lock, false);