Changeset 9f22213 in mainline for generic/src/ipc/sysipc.c

Timestamp:

2006-03-19T12:43:12Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7c7aae16

Parents:

b4b45210

Message:

More IPC stuff, added correct closing of connections from both sides.

File:

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

generic/src/ipc/sysipc.c

@@ -76 +76 @@
 
 /** Return true if the caller (ipc_answer) should save
- * the old call contents and call answer_preprocess
- */
-static inline int answer_will_preprocess(call_t *call)
+ * the old call contents for answer_preprocess
+ */
+static inline int answer_need_old(call_t *call)
 {
         if (IPC_GET_METHOD(call->data) == IPC_M_CONNECT_TO_ME)
@@ -91 +91 @@
 {
         int phoneid;
+
+        if (IPC_GET_RETVAL(answer->data) == EHANGUP) {
+                /* Atomic operation */
+                answer->data.phone->callee = NULL;
+        }
+
+        if (!olddata)
+                return;
 
         if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_TO_ME) {
@@ -98 +106 @@
                         phone_dealloc(phoneid);
                 } else {
-                        /* The connection was accepted */
+                                /* The connection was accepted */
                         phone_connect(phoneid,&answer->sender->answerbox);
                 }
@@ -118 +126 @@
 static int process_answer(answerbox_t *box,call_t *call)
 {
+        if (IPC_GET_RETVAL(call->data) == EHANGUP && \
+            call->flags & IPC_CALL_FORWARDED)
+                IPC_SET_RETVAL(call->data, EFORWARD);
         return 0;
 }
@@ -276 +287 @@
                 return ENOENT;
 
+        call->flags |= IPC_CALL_FORWARDED;
+
         GET_CHECK_PHONE(phone, phoneid, { 
                 IPC_SET_RETVAL(call->data, EFORWARD);
@@ -299 +312 @@
         }
 
-        ipc_forward(call, phone, &TASK->answerbox);
-
-        return 0;
+        return ipc_forward(call, phone, &TASK->answerbox);
 }
 
@@ -310 +321 @@
         call_t *call;
         ipc_data_t saved_data;
-        int preprocess = 0;
+        int saveddata = 0;
 
         call = get_call(callid);
@@ -316 +327 @@
                 return ENOENT;
 
-        if (answer_will_preprocess(call)) {
+        if (answer_need_old(call)) {
                 memcpy(&saved_data, &call->data, sizeof(call->data));
-                preprocess = 1;
+                saveddata = 1;
         }
 
@@ -324 +335 @@
         IPC_SET_ARG1(call->data, arg1);
         IPC_SET_ARG2(call->data, arg2);
-
-        if (preprocess)
-                answer_preprocess(call, &saved_data);
+        answer_preprocess(call, saveddata ? &saved_data : NULL);
 
         ipc_answer(&TASK->answerbox, call);
@@ -337 +346 @@
         call_t *call;
         ipc_data_t saved_data;
-        int preprocess = 0;
+        int saveddata = 0;
 
         call = get_call(callid);
@@ -343 +352 @@
                 return ENOENT;
 
-        if (answer_will_preprocess(call)) {
+        if (answer_need_old(call)) {
                 memcpy(&saved_data, &call->data, sizeof(call->data));
-                preprocess = 1;
+                saveddata = 1;
         }
         copy_from_uspace(&call->data.args, &data->args, 
                          sizeof(call->data.args));
 
-        if (preprocess)
-                answer_preprocess(call, &saved_data);
+        answer_preprocess(call, saveddata ? &saved_data : NULL);
         
         ipc_answer(&TASK->answerbox, call);
@@ -449 +457 @@
 restart:        
         call = ipc_wait_for_call(&TASK->answerbox, flags);
+        if (!call)
+                return 0;
 
         if (call->flags & IPC_CALL_ANSWERED) {