Changeset b666608 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2010-12-12T13:49:35Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4c74ac3

Parents:

94c19b8 (diff), 0c05496 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from usb/development into smekideki

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.
- *
+/** 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. 
  * @return 0 if limit not reached or -1 if limit exceeded.
  *
  */
-static int check_call_limit(void)
-{
-        if (atomic_preinc(&TASK->active_calls) > IPC_MAX_ASYNC_CALLS) {
-                atomic_dec(&TASK->active_calls);
+static int check_call_limit(phone_t *phone)
+{
+        if (atomic_get(&phone->active_calls) >= IPC_MAX_ASYNC_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);
                 }