Changes in kernel/generic/src/ipc/ipc.c [228e490:7e752b2] in mainline

File:

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

kernel/generic/src/ipc/ipc.c

@@ -270 +270 @@
  *
  */
-void ipc_backsend_err(phone_t *phone, call_t *call, sysarg_t err)
+void ipc_backsend_err(phone_t *phone, call_t *call, unative_t err)
 {
         call->data.phone = phone;
@@ -367 +367 @@
                 
                 call_t *call = ipc_call_alloc(0);
-                IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
+                IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
                 call->flags |= IPC_CALL_DISCARD_ANSWER;
                 _ipc_call(phone, box, call);
@@ -547 +547 @@
                          * disconnected.
                          */
-                        IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP);
+                        IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
                         call->flags |= IPC_CALL_DISCARD_ANSWER;
                         _ipc_call(phone, box, call);
@@ -655 +655 @@
                     (call->flags & IPC_CALL_NOTIF));
                 
+                /*
+                 * Record the receipt of this call in the current task's counter
+                 * of active calls. IPC_M_PHONE_HUNGUP calls do not contribute
+                 * to this counter so do not record answers to them either.
+                 */
+                if (!(call->flags & IPC_CALL_DISCARD_ANSWER))
+                        atomic_dec(&TASK->active_calls);
+                
                 ipc_call_free(call);
         }
@@ -741 +749 @@
                     " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
                     call->sender->taskid,
-                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
+                    IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
@@ -757 +765 @@
                     " A4:%" PRIun " A5:%" PRIun " Flags:%x\n", call,
                     call->sender->taskid,
-                    IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
+                    IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),
@@ -771 +779 @@
                 printf("Callid:%p M:%" PRIun " A1:%" PRIun " A2:%" PRIun
                     " A3:%" PRIun " A4:%" PRIun " A5:%" PRIun " Flags:%x\n",
-                    call, IPC_GET_IMETHOD(call->data), IPC_GET_ARG1(call->data),
+                    call, IPC_GET_METHOD(call->data), IPC_GET_ARG1(call->data),
                     IPC_GET_ARG2(call->data), IPC_GET_ARG3(call->data),
                     IPC_GET_ARG4(call->data), IPC_GET_ARG5(call->data),