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

Timestamp:

2016-09-02T17:58:05Z (8 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

File:

• kernel/generic/src/ipc/ipc.c (modified) (4 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();