Changeset 2c2d54a in mainline for kernel/generic/src/ipc

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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:

Merge from lp:~jakub/helenos/pager

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (4 diffs)
• ops/pagein.c (added)
• sysipc.c (modified) (3 diffs)
• sysipc_ops.c (modified) (2 diffs)

kernel/generic/src/ipc/ipc.c

@@ -77 +77 @@
         call->forget = false;
         call->sender = NULL;
+        call->callerbox = &TASK->answerbox;
         call->buffer = NULL;
 }
@@ -185 +186 @@
         phone->state = IPC_PHONE_FREE;
         atomic_set(&phone->active_calls, 0);
+}
+
+/** Helper function to facilitate synchronous calls.
+ *
+ * @param phone   Destination kernel phone structure.
+ * @param request Call structure with request.
+ *
+ * @return EOK on success or a negative error code.
+ *
+ */
+int ipc_call_sync(phone_t *phone, call_t *request)
+{
+        answerbox_t *mybox = slab_alloc(ipc_answerbox_slab, 0);
+        ipc_answerbox_init(mybox, TASK);
+        
+        /* We will receive data in a special box. */
+        request->callerbox = mybox;
+        
+        int rc = ipc_call(phone, request);
+        if (rc != EOK) {
+                slab_free(ipc_answerbox_slab, mybox);
+                return rc;
+        }
+        // TODO: forget the call if interrupted
+        (void) ipc_wait_for_call(mybox, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
+        
+        slab_free(ipc_answerbox_slab, mybox);
+        return EOK;
 }
 
@@ -220 +249 @@
         spinlock_unlock(&call->forget_lock);
 
-        answerbox_t *callerbox = &call->sender->answerbox;
+        answerbox_t *callerbox = call->callerbox;
         bool do_lock = ((!selflocked) || (callerbox != &TASK->answerbox));
         
@@ -755 +784 @@
         ipc_cleanup_call_list(&TASK->answerbox,
             &TASK->answerbox.dispatched_calls);
-
+        
         ipc_forget_all_active_calls();
         ipc_wait_for_all_answered_calls();

kernel/generic/src/ipc/sysipc.c

@@ -106 +106 @@
 {
         switch (imethod) {
+        case IPC_M_PAGE_IN:
         case IPC_M_SHARE_OUT:
         case IPC_M_SHARE_IN:
@@ -137 +138 @@
         case IPC_M_CONNECT_TO_ME:
         case IPC_M_CONNECT_ME_TO:
+        case IPC_M_PAGE_IN:
         case IPC_M_SHARE_OUT:
         case IPC_M_SHARE_IN:
@@ -257 +259 @@
 {
         return SYSIPC_OP(request_process, call, box);
+}
+
+/** Make a call over IPC and wait for reply.
+ *
+ * @param phoneid     Phone handle for the call.
+ * @param data[inout] Structure with request/reply data.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there is no such phone handle.
+ *
+ */
+int ipc_req_internal(int phoneid, ipc_data_t *data)
+{
+        phone_t *phone;
+        if (phone_get(phoneid, &phone) != EOK)
+                return ENOENT;
+        
+        call_t *call = ipc_call_alloc(0);
+        memcpy(call->data.args, data->args, sizeof(data->args));
+        
+        int rc = request_preprocess(call, phone);
+        if (!rc) {
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_begin();
+#endif
+
+                rc = ipc_call_sync(phone, call); 
+
+#ifdef CONFIG_UDEBUG
+                udebug_stoppable_end();
+#endif
+
+                if (rc != EOK)
+                        return EINTR;
+
+                process_answer(call);
+        } else
+                IPC_SET_RETVAL(call->data, rc);
+        
+        memcpy(data->args, call->data.args, sizeof(data->args));
+        ipc_call_free(call);
+        
+        return EOK;
 }
 

kernel/generic/src/ipc/sysipc_ops.c

@@ -42 +42 @@
 sysipc_ops_t ipc_m_connect_to_me_ops;
 sysipc_ops_t ipc_m_connect_me_to_ops;
+sysipc_ops_t ipc_m_page_in_ops;
 sysipc_ops_t ipc_m_share_out_ops;
 sysipc_ops_t ipc_m_share_in_ops;
@@ -54 +55 @@
         [IPC_M_CONNECT_TO_ME] = &ipc_m_connect_to_me_ops,
         [IPC_M_CONNECT_ME_TO] = &ipc_m_connect_me_to_ops,
+        [IPC_M_PAGE_IN] = &ipc_m_page_in_ops,
         [IPC_M_SHARE_OUT] = &ipc_m_share_out_ops,
         [IPC_M_SHARE_IN] = &ipc_m_share_in_ops,