Changeset ba81cab in mainline for generic/src/ipc/sysipc.c

Timestamp:

2006-03-18T01:06:13Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

fbcfd458

Parents:

81c4c6da

Message:

Better IPC implementation with regard to locking and final cleanup.

File:

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

generic/src/ipc/sysipc.c

@@ -47 +47 @@
  *
  */
+
+#define GET_CHECK_PHONE(phone,phoneid,err) { \
+      if (phoneid > IPC_MAX_PHONES) { err; } \
+      phone = &TASK->phones[phoneid]; \
+}
+
 
 /** Return true if the method is a system method */
@@ -151 +157 @@
                 return EPERM;
 
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return ENOENT;
-
-        ipc_call_init(&call);
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
+
+        ipc_call_static_init(&call);
         IPC_SET_METHOD(call.data, method);
         IPC_SET_ARG1(call.data, arg1);
@@ -173 +177 @@
         phone_t *phone;
 
-        ipc_call_init(&call);
+        ipc_call_static_init(&call);
         copy_from_uspace(&call.data, question, sizeof(call.data));
 
@@ -179 +183 @@
                 return EPERM;
         
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return ENOENT;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
         ipc_call_sync(phone, &call);
@@ -220 +222 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return IPC_CALLRET_FATAL;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
         call = ipc_call_alloc();
@@ -246 +246 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return IPC_CALLRET_FATAL;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
         call = ipc_call_alloc();
@@ -280 +278 @@
                 return ENOENT;
 
-        phone = get_phone_and_lock(phoneid);
-        if (!phone) {
+        GET_CHECK_PHONE(phone, phoneid, { 
                 IPC_SET_RETVAL(call->data, EFORWARD);
                 ipc_answer(&TASK->answerbox, call);
                 return ENOENT;
-        }
+        });             
 
         if (!is_forwardable(IPC_GET_METHOD(call->data))) {
@@ -304 +301 @@
         }
 
-        ipc_forward(call, phone->callee, &TASK->answerbox);
+        ipc_forward(call, phone, &TASK->answerbox);
 
         return 0;
@@ -372 +369 @@
         phone_t *phone;
 
-        ipc_call_init(&call);
+        ipc_call_static_init(&call);
         IPC_SET_METHOD(call.data, IPC_M_CONNECTTOME);
         IPC_SET_ARG1(call.data, arg1);
         IPC_SET_ARG2(call.data, arg2);
         
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return ENOENT;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
         ipc_call_sync(phone, &call);
@@ -402 +397 @@
         int newphid;
 
-        phone = get_phone_and_lock(phoneid);
-        if (!phone)
-                return ENOENT;
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
 
         newphid = phone_alloc();
@@ -410 +403 @@
                 return ELIMIT;
 
-        ipc_call_init(&call);
+        ipc_call_static_init(&call);
         IPC_SET_METHOD(call.data, IPC_M_CONNECTMETO);
         IPC_SET_ARG1(call.data, arg1);