WebSVN – HelenOS-historic – Diff – /kernel/trunk/generic/src/ipc/ipc.c

 /* Lock ordering
+ *
  * First the answerbox, then the phone
  */
-#include <synch/condvar.h>
+#include <synch/spinlock.h>
-#include <synch/mutex.h>
+#include <synch/waitq.h>
 #include <ipc/ipc.h>
 #include <errno.h>
 #include <mm/slab.h>
 #include <arch.h>
 #include <proc/task.h>
 /** Initialize answerbox structure
  */
 void ipc_answerbox_init(answerbox_t *box)
+{
-    mutex_initialize(&box->mutex);
+    spinlock_initialize(&box->lock, "ipc_box_lock");
-    condvar_initialize(&box->cv);
+    waitq_initialize(&box->wq);
     list_initialize(&box->connected_phones);
     list_initialize(&box->calls);
     list_initialize(&box->dispatched_calls);
     list_initialize(&box->answers);
     box->task = TASK;
+}
-/** Initialize phone structure and connect phone to naswerbox
+/** Connect phone to answerbox */
- */
-void ipc_phone_init(phone_t *phone, answerbox_t *box)
+void ipc_phone_connect(phone_t *phone, answerbox_t *box)
+{
-    spinlock_initialize(&phone->lock, "phone_lock");
+    ASSERT(!phone->callee);
+    phone->busy = 1;
     phone->callee = box;
-    mutex_lock(&box->mutex);
+    spinlock_lock(&box->lock);
     list_append(&phone->list, &box->connected_phones);
-    mutex_unlock(&box->mutex);
+    spinlock_unlock(&box->lock);
+}
+/** Initialize phone structure and connect phone to naswerbox
+ */
+void ipc_phone_init(phone_t *phone)
+{
+    spinlock_initialize(&phone->lock, "phone_lock");
+    phone->callee = NULL;
+    phone->busy = 0;
+}
 /** Disconnect phone from answerbox */
 void ipc_phone_destroy(phone_t *phone)
+{
     answerbox_t *box = phone->callee;
     ASSERT(box);
-    mutex_lock(&box->mutex);
+    spinlock_lock(&box->lock);
     list_remove(&phone->list);
-    mutex_unlock(&box->mutex);
+    spinlock_unlock(&box->lock);
+}
 /** Helper function to facilitate synchronous calls */
 void ipc_call_sync(phone_t *phone, call_t *request)
+{
 /** Send a asynchronous request using phone to answerbox
+ *
  * @param phone Phone connected to answerbox
  * @param request Request to be sent
  */
-void ipc_call(phone_t *phone, call_t *request)
+void ipc_call(phone_t *phone, call_t *call)
+{
     answerbox_t *box = phone->callee;
     ASSERT(box);
-    mutex_lock(&box->mutex);
+    spinlock_lock(&box->lock);
-    list_append(&request->list, &box->calls);
+    list_append(&call->list, &box->calls);
-    mutex_unlock(&box->mutex);
+    spinlock_unlock(&box->lock);
+    waitq_wakeup(&box->wq, 0);
+}
+/** Forwards call from one answerbox to a new one
+ *
+ * @param request Request to be forwarded
+ * @param newbox Target answerbox
+ * @param oldbox Old answerbox
+ */
+void ipc_forward(call_t *call, answerbox_t *newbox, answerbox_t *oldbox)
+{
+    spinlock_lock(&oldbox->lock);
+    list_remove(&call->list);
-    condvar_signal(&box->cv);
+    spinlock_unlock(&oldbox->lock);
+    spinlock_lock(&newbox->lock);
+    list_append(&call->list, &newbox->calls);
+    spinlock_lock(&newbox->lock);
+    waitq_wakeup(&newbox->wq, 0);
+}
 /** Answer message back to phone
+ *
  * @param box Answerbox that is answering the message
+{
     answerbox_t *callerbox = request->callerbox;
     request->flags |= IPC_CALL_ANSWERED;
-    mutex_lock(&box->mutex);
+    spinlock_lock(&box->lock);
     list_remove(&request->list);
-    mutex_unlock(&box->mutex);
+    spinlock_unlock(&box->lock);
-    mutex_lock(&callerbox->mutex);
+    spinlock_lock(&callerbox->lock);
     list_append(&request->list, &callerbox->answers);
-    mutex_unlock(&callerbox->mutex);
+    spinlock_unlock(&callerbox->lock);
-    condvar_signal(&callerbox->cv);
+    waitq_wakeup(&callerbox->wq, 0);
+}
 /** Wait for phone call
+ *
  * @return Recived message address
  */
 call_t * ipc_wait_for_call(answerbox_t *box, int flags)
+{
     call_t *request;
-    mutex_lock(&box->mutex);
+    spinlock_lock(&box->lock);
     while (1) {
         if (!list_empty(&box->answers)) {
             /* Handle asynchronous answers */
             request = list_get_instance(box->answers.next, call_t, list);
             list_remove(&request->list);
             /* Append request to dispatch queue */
             list_append(&request->list, &box->dispatched_calls);
         } else {
             if (!(flags & IPC_WAIT_NONBLOCKING)) {
                 /* Wait for event to appear */
-                condvar_wait(&box->cv, &box->mutex);
+                spinlock_unlock(&box->lock);
+                waitq_sleep(&box->wq);
+                spinlock_lock(&box->lock);
                 continue;
+            }
             request = NULL;
+        }
         break;
+    }
-    mutex_unlock(&box->mutex);
+    spinlock_unlock(&box->lock);
     return request;
+}
 /** Initilize ipc subsystem */
 void ipc_init(void)

Subversion Repositories HelenOS-historic

(root)/kernel/trunk/generic/src/ipc/ipc.c – Rev 1027 → 1040