Changes in kernel/generic/src/ipc/sysipc.c [503ffce:706b4de] in mainline

File:

• kernel/generic/src/ipc/sysipc.c (modified) (13 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -286 +286 @@
 #endif
 
-                kobject_add_ref(call->kobject);
+                ipc_call_hold(call);
                 rc = ipc_call_sync(kobj->phone, call);
                 spinlock_lock(&call->forget_lock);
                 bool forgotten = call->forget;
                 spinlock_unlock(&call->forget_lock);
-                kobject_put(call->kobject);
+                ipc_call_release(call);
 
 #ifdef CONFIG_UDEBUG
@@ -306 +306 @@
                                  * deallocation.
                                  */
-                                kobject_put(call->kobject);
+                                ipc_call_free(call);
                         } else {
                                 /*
@@ -323 +323 @@
         
         memcpy(data->args, call->data.args, sizeof(data->args));
-        kobject_put(call->kobject);
+        ipc_call_free(call);
         kobject_put(kobj);
         
@@ -347 +347 @@
 /** Make a fast asynchronous call over IPC.
  *
- * This function can only handle three arguments of payload, but is faster than
+ * This function can only handle four arguments of payload, but is faster than
  * the generic function sys_ipc_call_async_slow().
  *
@@ -355 +355 @@
  * @param arg2     Service-defined payload argument.
  * @param arg3     Service-defined payload argument.
- * @param label    User-defined label.
+ * @param arg4     Service-defined payload argument.
  *
  * @return Call hash on success.
@@ -362 +362 @@
  */
 sysarg_t sys_ipc_call_async_fast(sysarg_t handle, sysarg_t imethod,
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t label)
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -378 +378 @@
         IPC_SET_ARG2(call->data, arg2);
         IPC_SET_ARG3(call->data, arg3);
+        IPC_SET_ARG4(call->data, arg4);
         
         /*
@@ -384 +385 @@
          */
         IPC_SET_ARG5(call->data, 0);
-
-        /* Set the user-defined label */
-        call->data.label = label;
         
         int res = request_preprocess(call, kobj->phone);
@@ -403 +401 @@
  * @param handle  Phone capability for the call.
  * @param data    Userspace address of call data with the request.
- * @param label   User-defined label.
  *
  * @return See sys_ipc_call_async_fast().
  *
  */
-sysarg_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data,
-    sysarg_t label)
+sysarg_t sys_ipc_call_async_slow(sysarg_t handle, ipc_data_t *data)
 {
         kobject_t *kobj = kobject_get(TASK, handle, KOBJECT_TYPE_PHONE);
@@ -424 +420 @@
             sizeof(call->data.args));
         if (rc != 0) {
-                kobject_put(call->kobject);
+                ipc_call_free(call);
                 kobject_put(kobj);
                 return (sysarg_t) rc;
         }
-
-        /* Set the user-defined label */
-        call->data.label = label;
         
         int res = request_preprocess(call, kobj->phone);
@@ -728 +721 @@
  *
  * @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,
@@ -754 +751 @@
                 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_call_free(call);
+                
+                return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
         }
         
@@ -766 +762 @@
                 
                 if (call->flags & IPC_CALL_DISCARD_ANSWER) {
-                        kobject_put(call->kobject);
+                        ipc_call_free(call);
                         goto restart;
                 }
-
-                call->data.flags = IPC_CALLID_ANSWERED;
                 
                 STRUCT_TO_USPACE(calldata, &call->data);
-                kobject_put(call->kobject);
+                ipc_call_free(call);
                 
-                return (sysarg_t) call;
+                return ((sysarg_t) call) | IPC_CALLID_ANSWERED;
         }