Changeset 5f62ef9 in mainline

Timestamp:

2006-03-14T23:47:04Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

d99d8c8

Parents:

1065603e

Message:

Completed asynchronous ipc.

Location:

generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/proc/task.h (modified) (1 diff)
• include/syscall/syscall.h (modified) (1 diff)
• src/ipc/ns.c (modified) (1 diff)
• src/proc/task.c (modified) (1 diff)
• src/syscall/syscall.c (modified) (10 diffs)

generic/include/ipc/ipc.h

@@ -33 +33 @@
 /* - the uspace may not be able to utilize full length */
 #define IPC_CALL_LEN    4
+
+/** Maximum active async calls per thread */
+#define IPC_MAX_ASYNC_CALLS  4
 
 /* Flags for calls */

generic/include/proc/task.h

@@ -41 +41 @@
         link_t tasks_link;      /**< Link to other tasks within the system. */
         as_t *as;               /**< Address space. */
+        /* IPC stuff */
         answerbox_t answerbox;  /**< Communication endpoint */
         phone_t phones[IPC_MAX_PHONES];
+        atomic_t active_calls;  /**< Active asynchronous messages */
 };
 

generic/include/syscall/syscall.h

@@ -34 +34 @@
         SYS_IO,
         SYS_MREMAP,
+        SYS_IPC_CALL_SYNC_FAST,
         SYS_IPC_CALL_SYNC,
-        SYS_IPC_CALL_SYNC_MEDIUM,
+        SYS_IPC_CALL_ASYNC_FAST,
         SYS_IPC_CALL_ASYNC,
         SYS_IPC_ANSWER,

generic/src/ipc/ns.c

@@ -46 +46 @@
                 switch (IPC_GET_METHOD(call->data)) {
                 case NS_PING:
-                        printf("Ping.\n");
+                        printf("Ping - %X, %X\n", IPC_GET_ARG1(call->data),
+                               IPC_GET_ARG2(call->data));
                         IPC_SET_RETVAL(call->data, 0);
+                        IPC_SET_ARG1(call->data, 0xdeaddead);
+                        IPC_SET_ARG2(call->data, 0xdeaddea2);
                         break;
                 default:

generic/src/proc/task.c

@@ -82 +82 @@
         if (ipc_phone_0)
                 ipc_phone_init(&ta->phones[0], ipc_phone_0);
+        atomic_set(&ta->active_calls, 0);
         
         ipl = interrupts_disable();

generic/src/syscall/syscall.c

@@ -57 +57 @@
 }
 
+static phone_t * get_phone(__native phoneid)
+{
+        phone_t *phone;
+
+        if (phoneid >= IPC_MAX_PHONES)
+                return NULL;
+
+        phone = &TASK->phones[phoneid];
+        if (!phone->callee)
+                return NULL;
+        return phone;
+}
+
 /** Send a call over IPC, wait for reply, return to user
  *
@@ -62 +75 @@
            -2 on 'Too many async request, handle answers first
  */
-static __native sys_ipc_call_sync(__native phoneid, __native method, 
-                                   __native arg1, __native *data)
+static __native sys_ipc_call_sync_fast(__native phoneid, __native method, 
+                                       __native arg1, __native *data)
 {
         call_t call;
@@ -69 +82 @@
         /* Special answerbox for synchronous messages */
 
-        if (phoneid >= IPC_MAX_PHONES)
-                return IPC_CALLRET_FATAL;
-
-        phone = &TASK->phones[phoneid];
-        if (!phone->callee)
+        phone = get_phone(phoneid);
+        if (!phone)
                 return IPC_CALLRET_FATAL;
 
@@ -87 +97 @@
 }
 
-static __native sys_ipc_call_sync_medium(__native phoneid, __native *data)
+/** Synchronous IPC call allowing to send whole message */
+static __native sys_ipc_call_sync(__native phoneid, __native *data)
 {
         call_t call;
@@ -93 +104 @@
         /* Special answerbox for synchronous messages */
 
-        if (phoneid >= IPC_MAX_PHONES)
-                return IPC_CALLRET_FATAL;
-
-        phone = &TASK->phones[phoneid];
-        if (!phone->callee)
+        phone = get_phone(phoneid);
+        if (!phone)
                 return IPC_CALLRET_FATAL;
 
@@ -110 +118 @@
 }
 
+/** Check that the task did not exceed allowed limit
+ *
+ * @return 0 - Limit OK,   -1 - limit exceeded
+ */
+static int check_call_limit(void)
+{
+        if (atomic_inc_post(&TASK->active_calls) > IPC_MAX_ASYNC_CALLS) {
+                atomic_dec(&TASK->active_calls);
+                return -1;
+        }
+        return 0;
+}
 
 /** Send an asynchronous call over ipc
@@ -116 +136 @@
            -2 on 'Too many async request, handle answers first
  */
-static __native sys_ipc_call_async(__native phoneid, __native method, 
-                                   __native arg1, __native arg2)
-{
-        call_t *call;
-        phone_t *phone;
-
-        if (phoneid >= IPC_MAX_PHONES)
-                return IPC_CALLRET_FATAL;
-
-        phone = &TASK->phones[phoneid];
-        if (!phone->callee)
-                return IPC_CALLRET_FATAL;
-
-        /* TODO: Check that we did not exceed system imposed maximum
-         * of asynchrnously sent messages
-         * - the userspace should be able to handle it correctly
-         */
+static __native sys_ipc_call_async_fast(__native phoneid, __native method, 
+                                        __native arg1, __native arg2)
+{
+        call_t *call;
+        phone_t *phone;
+
+        phone = get_phone(phoneid);
+        if (!phone)
+                return IPC_CALLRET_FATAL;
+
+        if (check_call_limit())
+                return IPC_CALLRET_TEMPORARY;
+
         call = ipc_call_alloc();
         IPC_SET_METHOD(call->data, method);
@@ -143 +159 @@
 }
 
+/** Synchronous IPC call allowing to send whole message
+ *
+ * @return The same as sys_ipc_call_async
+ */
+static __native sys_ipc_call_async(__native phoneid, __native *data)
+{
+        call_t *call;
+        phone_t *phone;
+
+        phone = get_phone(phoneid);
+        if (!phone)
+                return IPC_CALLRET_FATAL;
+
+        if (check_call_limit())
+                return IPC_CALLRET_TEMPORARY;
+
+        call = ipc_call_alloc();
+        copy_from_uspace(&call->data, data, sizeof(call->data));
+        
+        ipc_call(phone, call);
+
+        return (__native) call;
+}
+
+
 /** Send IPC answer */
 static __native sys_ipc_answer(__native callid, __native retval, __native arg1,
@@ -175 +216 @@
 
         copy_to_uspace(calldata, &call->data, sizeof(call->data));
+
         if (call->flags & IPC_CALL_ANSWERED) {
                 ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
                 ipc_call_free(call);
+                atomic_dec(&TASK->active_calls);
                 return ((__native)call) | IPC_CALLID_ANSWERED;
         }
@@ -192 +235 @@
         sys_io,
         sys_mremap,
+        sys_ipc_call_sync_fast,
         sys_ipc_call_sync,
-        sys_ipc_call_sync_medium,
+        sys_ipc_call_async_fast,
         sys_ipc_call_async,
         sys_ipc_answer,