Changes in uspace/lib/c/generic/ipc.c [d7978525:c170438] in mainline

File:

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

uspace/lib/c/generic/ipc.c

@@ -81 +81 @@
 LIST_INITIALIZE(queued_calls);
 
-static atomic_t ipc_futex = FUTEX_INITIALIZER;
+static futex_t ipc_futex = FUTEX_INITIALIZER;
 
 /** Send asynchronous message via syscall.
@@ -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) {
                 /* Nothing to do regardless if failed or not */
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 return;
         }
         
         if (callid == (ipc_callid_t) IPC_CALLRET_FATAL) {
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 
                 /* Call asynchronous handler with error code */
@@ -152 +149 @@
         
         if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
-                futex_up(&ipc_futex);
+                futex_unlock(&ipc_futex);
                 
                 call->u.msg.phoneid = phoneid;
@@ -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;
@@ -175 +167 @@
         /* Add call to the list of dispatched calls */
         list_append(&call->list, &dispatched_calls);
-        futex_up(&ipc_futex);
+        futex_unlock(&ipc_futex);
 }
 
@@ -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;
@@ -219 +207 @@
          */
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         ipc_callid_t callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid,
             imethod, arg1, arg2, arg3, arg4);
@@ -226 +214 @@
                 if (!call) {
                         call = ipc_prepare_async(private, callback);
-                        if (!call)
+                        if (!call) {
+                                futex_unlock(&ipc_futex);
                                 return;
+                        }
                 }
                 
@@ -244 +234 @@
         }
         
-        ipc_finish_async(callid, phoneid, call, can_preempt);
+        ipc_finish_async(callid, phoneid, call);
 }
 
@@ -264 +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);
@@ -289 +275 @@
          */
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         ipc_callid_t callid =
             ipc_call_async_internal(phoneid, &call->u.msg.data);
         
-        ipc_finish_async(callid, phoneid, call, can_preempt);
+        ipc_finish_async(callid, phoneid, call);
 }
 
@@ -373 +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) {
@@ -384 +370 @@
                         call->u.callid = callid;
                         
-                        futex_down(&ipc_futex);
+                        futex_lock(&ipc_futex);
                         list_append(&call->list, &dispatched_calls);
-                        futex_up(&ipc_futex);
+                        futex_unlock(&ipc_futex);
                 }
                 
@@ -412 +398 @@
         callid &= ~IPC_CALLID_ANSWERED;
         
-        futex_down(&ipc_futex);
+        futex_lock(&ipc_futex);
         
         link_t *item;
@@ -423 +409 @@
                         list_remove(&call->list);
                         
-                        futex_up(&ipc_futex);
+                        futex_unlock(&ipc_futex);
                         
                         if (call->callback)
@@ -434 +420 @@
         }
         
-        futex_up(&ipc_futex);
+        futex_unlock(&ipc_futex);
 }