Changeset 2a7ba5e in mainline for uspace/lib/c/generic/ipc.c

Timestamp:

2016-05-24T21:03:32Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

609f8d9c

Parents:

0a981e3 (diff), c170438 (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 async framework changes

File:

• uspace/lib/c/generic/ipc.c (modified) (8 diffs)

uspace/lib/c/generic/ipc.c

@@ -96 +96 @@
 }
 
-/** Prolog for ipc_call_async_*() functions.
+/** Prologue for ipc_call_async_*() functions.
  *
  * @param private  Argument for the answer/error callback.
@@ -122 +122 @@
 }
 
-/** Epilog for ipc_call_async_*() functions.
+/** Epilogue for ipc_call_async_*() functions.
  *
  * @param callid      Value returned by the SYS_IPC_CALL_ASYNC_* syscall.
  * @param phoneid     Phone handle through which the call was made.
  * @param call        Structure returned by ipc_prepare_async().
- * @param can_preempt If true, the current fibril can be preempted
- *                    in this call.
- *
  */
 static inline void ipc_finish_async(ipc_callid_t callid, int phoneid,
-    async_call_t *call, bool can_preempt)
+    async_call_t *call)
 {
         if (!call) {
@@ -159 +156 @@
                 list_append(&call->list, &queued_calls);
                 
-                if (can_preempt) {
-                        call->fid = fibril_get_id();
-                        fibril_switch(FIBRIL_TO_MANAGER);
-                        /* Async futex unlocked by previous call */
-                } else {
-                        call->fid = 0;
-                        futex_up(&async_futex);
-                }
+                call->fid = fibril_get_id();
+                fibril_switch(FIBRIL_TO_MANAGER);
+                /* Async futex unlocked by previous call */
                 
                 return;
@@ -197 +189 @@
  * @param private     Argument to be passed to the answer/error callback.
  * @param callback    Answer or error callback.
- * @param can_preempt If true, the current fibril will be preempted in
- *                    case the kernel temporarily refuses to accept more
- *                    asynchronous calls.
- *
  */
 void ipc_call_async_fast(int phoneid, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, void *private,
-    ipc_async_callback_t callback, bool can_preempt)
+    ipc_async_callback_t callback)
 {
         async_call_t *call = NULL;
@@ -246 +234 @@
         }
         
-        ipc_finish_async(callid, phoneid, call, can_preempt);
+        ipc_finish_async(callid, phoneid, call);
 }
 
@@ -266 +254 @@
  * @param private     Argument to be passed to the answer/error callback.
  * @param callback    Answer or error callback.
- * @param can_preempt If true, the current fibril will be preempted in
- *                    case the kernel temporarily refuses to accept more
- *                    asynchronous calls.
- *
  */
 void ipc_call_async_slow(int phoneid, sysarg_t imethod, sysarg_t arg1,
     sysarg_t arg2, sysarg_t arg3, sysarg_t arg4, sysarg_t arg5, void *private,
-    ipc_async_callback_t callback, bool can_preempt)
+    ipc_async_callback_t callback)
 {
         async_call_t *call = ipc_prepare_async(private, callback);
@@ -295 +279 @@
             ipc_call_async_internal(phoneid, &call->u.msg.data);
         
-        ipc_finish_async(callid, phoneid, call, can_preempt);
+        ipc_finish_async(callid, phoneid, call);
 }
 
@@ -375 +359 @@
                 futex_up(&async_futex);
                 
-                if (call->fid)
-                        fibril_add_ready(call->fid);
+                assert(call->fid);
+                fibril_add_ready(call->fid);
                 
                 if (callid == (ipc_callid_t) IPC_CALLRET_FATAL) {