Changeset 706b4de in mainline

Timestamp:

2017-11-10T19:33:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f3365b6

Parents:

d420b22

Message:

Remove support for IPC_CALLRET_TEMPORARY

Files:

• abi/include/abi/ipc/ipc.h (modified) (1 diff)
• kernel/generic/src/ipc/sysipc.c (modified) (1 diff)
• uspace/app/trace/trace.c (modified) (2 diffs)
• uspace/lib/c/generic/ipc.c (modified) (3 diffs)

abi/include/abi/ipc/ipc.h

@@ -82 +82 @@
 /* Return values from sys_ipc_call_async(). */
 #define IPC_CALLRET_FATAL      -1
-#define IPC_CALLRET_TEMPORARY  -2
-
 
 /* Macros for manipulating calling data */

kernel/generic/src/ipc/sysipc.c

@@ -359 +359 @@
  * @return Call hash on success.
  * @return IPC_CALLRET_FATAL in case of a fatal error.
- * @return IPC_CALLRET_TEMPORARY if there are too many pending
- *         asynchronous requests; answers should be handled first.
  *
  */

uspace/app/trace/trace.c

@@ -284 +284 @@
         sysarg_t phoneid;
         
-        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
-            sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
                 return;
 
@@ -305 +304 @@
         int rc;
 
-        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
-            sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
+        if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL)
                 return;
 

uspace/lib/c/generic/ipc.c

@@ -148 +148 @@
         }
         
-        if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
-                futex_unlock(&ipc_futex);
-                
-                call->u.msg.phoneid = phoneid;
-                
-                futex_down(&async_futex);
-                list_append(&call->list, &queued_calls);
-                
-                call->fid = fibril_get_id();
-                fibril_switch(FIBRIL_TO_MANAGER);
-                /* Async futex unlocked by previous call */
-                
-                return;
-        }
-        
         call->u.callid = callid;
         
@@ -210 +195 @@
         ipc_callid_t callid = __SYSCALL6(SYS_IPC_CALL_ASYNC_FAST, phoneid,
             imethod, arg1, arg2, arg3, arg4);
-        
-        if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY) {
-                if (!call) {
-                        call = ipc_prepare_async(private, callback);
-                        if (!call) {
-                                futex_unlock(&ipc_futex);
-                                return;
-                        }
-                }
-                
-                IPC_SET_IMETHOD(call->u.msg.data, imethod);
-                IPC_SET_ARG1(call->u.msg.data, arg1);
-                IPC_SET_ARG2(call->u.msg.data, arg2);
-                IPC_SET_ARG3(call->u.msg.data, arg3);
-                IPC_SET_ARG4(call->u.msg.data, arg4);
-                
-                /*
-                 * To achieve deterministic behavior, we always zero out the
-                 * arguments that are beyond the limits of the fast version.
-                 */
-                
-                IPC_SET_ARG5(call->u.msg.data, 0);
-        }
         
         ipc_finish_async(callid, phoneid, call);
@@ -351 +313 @@
                 ipc_callid_t callid =
                     ipc_call_async_internal(call->u.msg.phoneid, &call->u.msg.data);
-                
-                if (callid == (ipc_callid_t) IPC_CALLRET_TEMPORARY)
-                        break;
                 
                 list_remove(&call->list);