Changeset 97d17fe in mainline

Timestamp:

2010-12-11T21:47:37Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

554debd

Parents:

c01f8e6

Message:

Associate the limit of active calls with a phone rather than the task.

Location:

kernel/generic

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -43 +43 @@
 #define IPC_CALL_LEN  6
 
-/** Maximum active async calls per thread */
-#ifdef CONFIG_DEBUG
-        #define IPC_MAX_ASYNC_CALLS  4
-#else
-        #define IPC_MAX_ASYNC_CALLS  4000
-#endif
+/** Maximum active async calls per phone */
+#define IPC_MAX_ASYNC_CALLS  4
 
 /* Flags for calls */

kernel/generic/include/proc/task.h

@@ -93 +93 @@
         phone_t phones[IPC_MAX_PHONES];
         stats_ipc_t ipc_info;   /**< IPC statistics */
-        /**
-         * Active asynchronous messages. It is used for limiting uspace to
-         * certain extent.
-         */
-        atomic_t active_calls;
         /** List of synchronous answerboxes. */
         link_t sync_box_head;

kernel/generic/src/ipc/ipc.c

@@ -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);
         }

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);
                 }
                 

kernel/generic/src/proc/task.c

@@ -151 +151 @@
         atomic_set(&task->refcount, 0);
         atomic_set(&task->lifecount, 0);
-        atomic_set(&task->active_calls, 0);
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
@@ -478 +477 @@
 #ifdef __32_BITS__
         if (*additional)
-                printf("%-8" PRIu64 " %9" PRIua " %7" PRIua, task->taskid,
-                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+                printf("%-8" PRIu64 " %9" PRIua, task->taskid,
+                    atomic_get(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
@@ -490 +489 @@
         if (*additional)
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
-                    "%9" PRIua " %7" PRIua,
-                    task->taskid, ucycles, usuffix, kcycles, ksuffix,
-                    atomic_get(&task->refcount), atomic_get(&task->active_calls));
+                    "%9" PRIua, task->taskid, ucycles, usuffix, kcycles,
+                    ksuffix, atomic_get(&task->refcount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",