Changeset b1e6269 in mainline for kernel/generic/src/ipc/ops/concttome.c

Timestamp:

2012-08-24T22:27:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

20282ef3

Parents:

13dbaa8c

Message:

Add two new sysipc_ops_t members:

• request_forget()
• answer_cleanup()

Call these members to perform cleanup at appropriate times.

File:

• kernel/generic/src/ipc/ops/concttome.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/concttome.c

@@ -55 +55 @@
 }
 
+static void answer_cleanup(call_t *answer, ipc_data_t *olddata)
+{
+        int phoneid = (int) IPC_GET_ARG5(*olddata);
+
+        phone_dealloc(phoneid);
+}
+
 static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
@@ -61 +68 @@
         if (IPC_GET_RETVAL(answer->data) != EOK) {
                 /* The connection was not accepted */
-                int phoneid = (int) IPC_GET_ARG5(*olddata);
-        
-                phone_dealloc(phoneid);
+                answer_cleanup(answer, olddata);
         } else {
                 /* The connection was accepted */
@@ -77 +82 @@
 sysipc_ops_t ipc_m_connect_to_me_ops = {
         .request_preprocess = null_request_preprocess,
+        .request_forget = null_request_forget,
         .request_process = request_process,
+        .answer_cleanup = answer_cleanup,
         .answer_preprocess = answer_preprocess,
         .answer_process = null_answer_process,