Changeset 503ffce in mainline

Timestamp:

2017-11-23T23:52:59Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f571ca49

Parents:

b1f36e3

Message:

Return IPC_CALLID_* in call data instead of callid

Callid will be replaced by capability handles soon so the API needs
to be cleanup up and any flags passed together with callid must be
passed using some other way.

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -106 +106 @@
         /** Phone which made or last masqueraded this call. */
         phone_t *phone;
+        /** Flags */
+        unsigned flags;
         /** User-defined label */
         sysarg_t label;

kernel/generic/src/ipc/sysipc.c

@@ -728 +728 @@
  *
  * @return Hash of the call.
- *         If IPC_CALLID_NOTIFICATION bit is set in the hash, the
- *         call is a notification. IPC_CALLID_ANSWERED denotes an
- *         answer.
- *
  */
 sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
@@ -758 +754 @@
                 call->data.phone = (void *) call->priv;
                 
+                call->data.flags = IPC_CALLID_NOTIFICATION;
+
                 STRUCT_TO_USPACE(calldata, &call->data);
-                
                 kobject_put(call->kobject);
                 
-                return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
+                return (sysarg_t) call;
         }
         
@@ -772 +769 @@
                         goto restart;
                 }
+
+                call->data.flags = IPC_CALLID_ANSWERED;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
                 kobject_put(call->kobject);
                 
-                return ((sysarg_t) call) | IPC_CALLID_ANSWERED;
+                return (sysarg_t) call;
         }
         

uspace/app/trace/ipcp.c

@@ -323 +323 @@
         pending_call_t *pcall;
         
-        if ((hash & IPC_CALLID_ANSWERED) == 0 && hash != IPCP_CALLID_SYNC) {
+        if ((call->flags & IPC_CALLID_ANSWERED) == 0 &&
+            hash != IPCP_CALLID_SYNC) {
                 /* Not a response */
                 if ((display_mask & DM_IPC) != 0) {
@@ -331 +332 @@
         }
         
-        hash = hash & ~IPC_CALLID_ANSWERED;
-        
         item = hash_table_find(&pending_calls, &hash);
         if (item == NULL)

uspace/lib/c/generic/async.c

@@ -1341 +1341 @@
         
         /* Kernel notification */
-        if ((callid & IPC_CALLID_NOTIFICATION)) {
+        if (call->flags & IPC_CALLID_NOTIFICATION) {
                 fibril_t *fibril = (fibril_t *) __tcb_get()->fibril_data;
                 unsigned oldsw = fibril->switches;
@@ -1495 +1495 @@
                 }
                 
-                if (callid & IPC_CALLID_ANSWERED)
+                if (call.flags & IPC_CALLID_ANSWERED)
                         continue;
                 

uspace/lib/c/generic/ipc.c

@@ -259 +259 @@
  * @param flags Flags passed to SYS_IPC_WAIT (blocking, nonblocking).
  *
- * @return Hash of the call. Note that certain bits have special
- *         meaning: IPC_CALLID_ANSWERED is set in an answer
- *         and IPC_CALLID_NOTIFICATION is used for notifications.
- *
+ * @return Hash of the call.
  */
 ipc_callid_t ipc_wait_cycle(ipc_call_t *call, sysarg_t usec,
@@ -271 +268 @@
         
         /* Handle received answers */
-        if (callid & IPC_CALLID_ANSWERED)
+        if (callid && (call->flags & IPC_CALLID_ANSWERED))
                 handle_answer(callid, call);
         
@@ -301 +298 @@
         do {
                 callid = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-        } while (callid & IPC_CALLID_ANSWERED);
+        } while (callid && (call->flags & IPC_CALLID_ANSWERED));
         
         return callid;
@@ -322 +319 @@
                 callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
                     SYNCH_FLAGS_NON_BLOCKING);
-        } while (callid & IPC_CALLID_ANSWERED);
+        } while (callid && (call->flags & IPC_CALLID_ANSWERED));
         
         return callid;

uspace/lib/c/include/ipc/common.h

@@ -49 +49 @@
         task_id_t in_task_id;
         sysarg_t in_phone_hash;
+        unsigned flags;
         struct async_call *label;
 } ipc_call_t;