Changeset d8f7362 in mainline

Timestamp:

2006-06-05T22:19:02Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

c74804f

Parents:

b65caba1

Message:

Small updates to ipc.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (4 diffs)
• src/ipc/irq.c (modified) (1 diff)
• src/ipc/sysipc.c (modified) (1 diff)

generic/include/ipc/ipc.h

@@ -226 +226 @@
 extern int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox);
 void ipc_cleanup(void);
-extern int ipc_phone_hangup(phone_t *phone, int aggressive);
+int ipc_phone_hangup(phone_t *phone);
 extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
 extern void ipc_print_task(task_id_t taskid);

generic/src/ipc/ipc.c

@@ -238 +238 @@
  *
  * @param phone Phone to be hung up
- * @param aggressive If false, the phone is only marked hungup, and all 
- *              messages are allowed to complete.
- *              If true, all messages in all queues are discarded. There
- *              may still be some messages that will be 'in-transit' on 
- *              other CPU.
  *              
  * @return 0 - phone disconnected, -1 - the phone was already disconnected
  */
-int ipc_phone_hangup(phone_t *phone, int aggressive)
+int ipc_phone_hangup(phone_t *phone)
 {
         answerbox_t *box;
@@ -270 +265 @@
                         _ipc_call(phone, box, call);
                 }
-        }
-
-        if (aggressive && atomic_get(&phone->active_calls) > 0) {
-                /* TODO: Do some stuff be VERY aggressive */
         }
 
@@ -383 +374 @@
         /* Disconnect all our phones ('ipc_phone_hangup') */
         for (i=0;i < IPC_MAX_PHONES; i++)
-                ipc_phone_hangup(&TASK->phones[i], 1);
+                ipc_phone_hangup(&TASK->phones[i]);
 
         /* Disconnect all connected irqs */
@@ -422 +413 @@
                                 TASK->phones[i].state = IPC_PHONE_FREE;
                         
+                        /* Just for sure, we might have had some 
+                         * IPC_PHONE_CONNECTING phones */
                         if (TASK->phones[i].state == IPC_PHONE_CONNECTED)
-                                ipc_phone_hangup(&TASK->phones[i], 1);
+                                ipc_phone_hangup(&TASK->phones[i]);
+                        /* If the hangup succeeded, it has sent a HANGUP 
+                         * message, the IPC is now in HUNGUP state, we
+                         * wait for the reply to come */
                         
                         if (TASK->phones[i].state != IPC_PHONE_FREE)

generic/src/ipc/irq.c

@@ -216 +216 @@
         if (irq_conns[irq].box) {
                 call = ipc_call_alloc(FRAME_ATOMIC);
+                if (!call) {
+                        spinlock_unlock(&irq_conns[irq].lock);
+                        return;
+                }
                 call->flags |= IPC_CALL_NOTIF;
                 IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);

generic/src/ipc/sysipc.c

@@ -493 +493 @@
         GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
-        if (ipc_phone_hangup(phone, 0))
+        if (ipc_phone_hangup(phone))
                 return -1;