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

Timestamp:

2017-09-28T22:08:15Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6636fb19

Parents:

dd20cbb

Message:

Introduce reference-counted kobjects

Capabilities are thus reduced to task-local names for references to kobjects.

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Ondrej Palkovsky
- * Copyright (c) 2012 Jakub Jermar 
+ * Copyright (c) 2012 Jakub Jermar
  * All rights reserved.
  *
@@ -42 +42 @@
 static int request_process(call_t *call, answerbox_t *box)
 {
-        int cap = phone_alloc(TASK);
+        cap_handle_t phone_handle = phone_alloc(TASK);
 
-        IPC_SET_ARG5(call->data, cap);
+        IPC_SET_ARG5(call->data, phone_handle);
         
         return EOK;
@@ -51 +51 @@
 static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
 {
-        int cap = (int) IPC_GET_ARG5(*olddata);
+        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
 
-        if (cap >= 0)
-                phone_dealloc(cap);
+        if (phone_handle >= 0)
+                phone_dealloc(phone_handle);
 
         return EOK;
@@ -61 +61 @@
 static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
-        int cap = (int) IPC_GET_ARG5(*olddata);
+        cap_handle_t phone_handle = (cap_handle_t) IPC_GET_ARG5(*olddata);
 
         if (IPC_GET_RETVAL(answer->data) != EOK) {
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else if (cap >= 0) {
+        } else if (phone_handle >= 0) {
                 /* The connection was accepted */
-                if (phone_connect(cap, &answer->sender->answerbox)) {
-                        /* Set 'phone hash' as arg5 of response */
+                if (phone_connect(phone_handle, &answer->sender->answerbox)) {
+                        /* Set 'phone hash' as ARG5 of response */
+                        kobject_t *phone_obj = kobject_get(TASK, phone_handle,
+                            KOBJECT_TYPE_PHONE);
                         IPC_SET_ARG5(answer->data,
-                            (sysarg_t) phone_get_current(cap));
+                            (sysarg_t) phone_obj->phone);
+                        kobject_put(phone_obj);
                 } else {
                         /* The answerbox is shutting down. */