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

Timestamp:

2009-11-28T20:28:13Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

eb79d60

Parents:

3da11f37 (diff), 2e07d27e (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:

merged head changes to this branch

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -61 +61 @@
 { \
         if (phoneid > IPC_MAX_PHONES) { \
-                err; \
+                err \
         } \
         phone = &TASK->phones[phoneid]; \
@@ -122 +122 @@
         case IPC_M_DATA_READ:
                 return 1;
-                break;
         default:
                 return 0;
@@ -376 +375 @@
                 phone_t *cloned_phone;
                 GET_CHECK_PHONE(cloned_phone, IPC_GET_ARG1(call->data),
-                    return ENOENT);
+                    return ENOENT;);
                 phones_lock(cloned_phone, phone);
                 if ((cloned_phone->state != IPC_PHONE_CONNECTED) ||
@@ -531 +530 @@
     unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data)
 {
-        call_t call;
+        call_t *call;
         phone_t *phone;
         int res;
         int rc;
         
-        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
-
-        ipc_call_static_init(&call);
-        IPC_SET_METHOD(call.data, method);
-        IPC_SET_ARG1(call.data, arg1);
-        IPC_SET_ARG2(call.data, arg2);
-        IPC_SET_ARG3(call.data, arg3);
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
+
+        call = ipc_call_alloc(0);
+        IPC_SET_METHOD(call->data, method);
+        IPC_SET_ARG1(call->data, arg1);
+        IPC_SET_ARG2(call->data, arg2);
+        IPC_SET_ARG3(call->data, arg3);
         /*
          * To achieve deterministic behavior, zero out arguments that are beyond
          * the limits of the fast version.
          */
-        IPC_SET_ARG4(call.data, 0);
-        IPC_SET_ARG5(call.data, 0);
-
-        if (!(res = request_preprocess(&call, phone))) {
+        IPC_SET_ARG4(call->data, 0);
+        IPC_SET_ARG5(call->data, 0);
+
+        if (!(res = request_preprocess(call, phone))) {
 #ifdef CONFIG_UDEBUG
                 udebug_stoppable_begin();
 #endif
-                rc = ipc_call_sync(phone, &call);
+                rc = ipc_call_sync(phone, call);
 #ifdef CONFIG_UDEBUG
                 udebug_stoppable_end();
 #endif
-                if (rc != EOK)
+                if (rc != EOK) {
+                        /* The call will be freed by ipc_cleanup(). */
                         return rc;
-                process_answer(&call);
+                }
+                process_answer(call);
 
         } else {
-                IPC_SET_RETVAL(call.data, res);
-        }
-        rc = STRUCT_TO_USPACE(&data->args, &call.data.args);
+                IPC_SET_RETVAL(call->data, res);
+        }
+        rc = STRUCT_TO_USPACE(&data->args, &call->data.args);
+        ipc_call_free(call);
         if (rc != 0)
                 return rc;
@@ -584 +586 @@
     ipc_data_t *reply)
 {
-        call_t call;
+        call_t *call;
         phone_t *phone;
         int res;
         int rc;
 
-        ipc_call_static_init(&call);
-        rc = copy_from_uspace(&call.data.args, &question->args,
-            sizeof(call.data.args));
-        if (rc != 0)
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
+
+        call = ipc_call_alloc(0);
+        rc = copy_from_uspace(&call->data.args, &question->args,
+            sizeof(call->data.args));
+        if (rc != 0) {
+                ipc_call_free(call);
                 return (unative_t) rc;
-
-        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
-
-        if (!(res = request_preprocess(&call, phone))) {
+        }
+
+
+        if (!(res = request_preprocess(call, phone))) {
 #ifdef CONFIG_UDEBUG
                 udebug_stoppable_begin();
 #endif
-                rc = ipc_call_sync(phone, &call);
+                rc = ipc_call_sync(phone, call);
 #ifdef CONFIG_UDEBUG
                 udebug_stoppable_end();
 #endif
-                if (rc != EOK)
+                if (rc != EOK) {
+                        /* The call will be freed by ipc_cleanup(). */
                         return rc;
-                process_answer(&call);
+                }
+                process_answer(call);
         } else 
-                IPC_SET_RETVAL(call.data, res);
-
-        rc = STRUCT_TO_USPACE(&reply->args, &call.data.args);
+                IPC_SET_RETVAL(call->data, res);
+
+        rc = STRUCT_TO_USPACE(&reply->args, &call->data.args);
+        ipc_call_free(call);
         if (rc != 0)
                 return rc;
@@ -658 +666 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL);
+        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL;);
 
         call = ipc_call_alloc(0);
@@ -697 +705 @@
                 return IPC_CALLRET_TEMPORARY;
 
-        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL);
+        GET_CHECK_PHONE(phone, phoneid, return IPC_CALLRET_FATAL;);
 
         call = ipc_call_alloc(0);
@@ -747 +755 @@
         call->flags |= IPC_CALL_FORWARDED;
 
-        GET_CHECK_PHONE(phone, phoneid, { 
+        GET_CHECK_PHONE(phone, phoneid, {
                 IPC_SET_RETVAL(call->data, EFORWARD);
                 ipc_answer(&TASK->answerbox, call);
@@ -952 +960 @@
         phone_t *phone;
 
-        GET_CHECK_PHONE(phone, phoneid, return ENOENT);
+        GET_CHECK_PHONE(phone, phoneid, return ENOENT;);
 
         if (ipc_phone_hangup(phone))
@@ -991 +999 @@
 
         if (call->flags & IPC_CALL_NOTIF) {
-                ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
-
                 /* Set in_phone_hash to the interrupt counter */
                 call->data.phone = (void *) call->priv;
@@ -1005 +1011 @@
         if (call->flags & IPC_CALL_ANSWERED) {
                 process_answer(call);
-
-                ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
 
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {