Changeset 9f22213 in mainline for generic/src/ipc/ipc.c

Timestamp:

2006-03-19T12:43:12Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7c7aae16

Parents:

b4b45210

Message:

More IPC stuff, added correct closing of connections from both sides.

File:

• generic/src/ipc/ipc.c (modified) (10 diffs)

generic/src/ipc/ipc.c

@@ -105 +105 @@
 
         ASSERT(!phone->callee);
-        phone->busy = 1;
+        phone->busy = IPC_BUSY_CONNECTED;
         phone->callee = box;
 
@@ -121 +121 @@
         spinlock_initialize(&phone->lock, "phone_lock");
         phone->callee = NULL;
-        phone->busy = 0;
+        phone->busy = IPC_BUSY_FREE;
+        atomic_set(&phone->active_calls, 0);
 }
 
@@ -172 +173 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *call)
 {
-        atomic_inc(&phone->active_calls);
-        call->data.phone = phone;
+        if (! (call->flags & IPC_CALL_FORWARDED)) {
+                atomic_inc(&phone->active_calls);
+                call->data.phone = phone;
+        }
 
         spinlock_lock(&box->lock);
@@ -186 +189 @@
  * @param request Request to be sent
  */
-void ipc_call(phone_t *phone, call_t *call)
+int ipc_call(phone_t *phone, call_t *call)
 {
         answerbox_t *box;
@@ -196 +199 @@
                 /* Trying to send over disconnected phone */
                 spinlock_unlock(&phone->lock);
-
-                call->data.phone = phone;
-                IPC_SET_RETVAL(call->data, ENOENT);
+                if (call->flags & IPC_CALL_FORWARDED) {
+                        IPC_SET_RETVAL(call->data, EFORWARD);
+                } else { /* Simulate sending a message */
+                        call->data.phone = phone;
+                        atomic_inc(&phone->active_calls);
+                        if (phone->busy == IPC_BUSY_CONNECTED)
+                                IPC_SET_RETVAL(call->data, EHANGUP);
+                        else
+                                IPC_SET_RETVAL(call->data, ENOENT);
+                }
+
                 _ipc_answer_free_call(call);
-                return;
+                return ENOENT;
         }
         _ipc_call(phone, box, call);
         
         spinlock_unlock(&phone->lock);
+        return 0;
 }
 
@@ -221 +233 @@
         box = phone->callee;
         if (!box) {
+                if (phone->busy == IPC_BUSY_CONNECTING) {
+                        spinlock_unlock(&phone->lock);
+                        return -1;
+                }
+                /* Already disconnected phone */
+                phone->busy = IPC_BUSY_FREE;
                 spinlock_unlock(&phone->lock);
-                return -1;
+                return 0;
         }
 
@@ -235 +253 @@
         _ipc_call(phone, box, call);
 
-        phone->busy = 0;
+        phone->busy = IPC_BUSY_FREE;
 
         spinlock_unlock(&phone->lock);
@@ -247 +265 @@
  * @param newbox Target answerbox
  * @param oldbox Old answerbox
- */
-void ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox)
+ * @return 0 on forward ok, error code, if there was error
+ * 
+ * - the return value serves only as an information for the forwarder,
+ *   the original caller is notified automatically with EFORWARD
+ */
+int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox)
 {
         spinlock_lock(&oldbox->lock);
-        atomic_dec(&call->data.phone->active_calls);
         list_remove(&call->list);
         spinlock_unlock(&oldbox->lock);
 
-        ipc_call(newphone, call);
+        return ipc_call(newphone, call);
 }
 
@@ -280 +301 @@
                 request = list_get_instance(box->answers.next, call_t, list);
                 list_remove(&request->list);
-                printf("%d %P\n", IPC_GET_METHOD(request->data), 
-                       request->data.phone);
                 atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
@@ -314 +333 @@
 void ipc_cleanup(task_t *task)
 {
-        /* Cancel all calls in my dispatch queue */
+        int i;
+
+        /* Disconnect all our phones ('ipc_phone_hangup') */
+        for (i=0;i < IPC_MAX_PHONES; i++)
+                ipc_phone_hangup(&task->phones[i]);
+
+        /* Disconnect all phones connected to answerbox */
+
+        /* Answer all messages in 'calls' and 'dispatched_calls' queues */
         
-}
+        /* Wait for all async answers to arrive */
+}