Changes in kernel/generic/src/ipc/sysipc.c [97d17fe:fa3b8e4] in mainline

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -644 +644 @@
 }
 
-/** Check that the task did not exceed the allowed limit of asynchronous calls
- * made over a phone.
- *
- * @param phone Phone to check the limit against. 
+/** Check that the task did not exceed the allowed limit of asynchronous calls.
+ *
  * @return 0 if limit not reached or -1 if limit exceeded.
  *
  */
-static int check_call_limit(phone_t *phone)
-{
-        if (atomic_get(&phone->active_calls) >= IPC_MAX_ASYNC_CALLS)
+static int check_call_limit(void)
+{
+        if (atomic_preinc(&TASK->active_calls) > IPC_MAX_ASYNC_CALLS) {
+                atomic_dec(&TASK->active_calls);
                 return -1;
+        }
         
         return 0;
@@ -680 +680 @@
     unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
 {
+        if (check_call_limit())
+                return IPC_CALLRET_TEMPORARY;
+        
         phone_t *phone;
         if (phone_get(phoneid, &phone) != EOK)
                 return IPC_CALLRET_FATAL;
-
-        if (check_call_limit(phone))
-                return IPC_CALLRET_TEMPORARY;
         
         call_t *call = ipc_call_alloc(0);
@@ -720 +720 @@
 unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data)
 {
+        if (check_call_limit())
+                return IPC_CALLRET_TEMPORARY;
+        
         phone_t *phone;
         if (phone_get(phoneid, &phone) != EOK)
                 return IPC_CALLRET_FATAL;
-
-        if (check_call_limit(phone))
-                return IPC_CALLRET_TEMPORARY;
 
         call_t *call = ipc_call_alloc(0);
@@ -1046 +1046 @@
                         ipc_call_free(call);
                         goto restart;
+                } else {
+                        /*
+                         * Decrement the counter of active calls only if the
+                         * call is not an answer to IPC_M_PHONE_HUNGUP,
+                         * which doesn't contribute to the counter.
+                         */
+                        atomic_dec(&TASK->active_calls);
                 }