Changeset 42a619b in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2011-08-19T08:58:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dcb7981, 903bac0a, c2cf033

Parents:

ef7052ec (diff), d894fbd (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 from lp:~jakub/helenos/camp2011.

File:

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

kernel/generic/src/ipc/sysipc.c

@@ -44 +44 @@
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
+#include <ipc/event.h>
 #include <ipc/kbox.h>
 #include <synch/waitq.h>
@@ -134 +135 @@
         case IPC_M_DATA_WRITE:
         case IPC_M_DATA_READ:
+        case IPC_M_STATE_CHANGE_AUTHORIZE:
                 return true;
         default:
@@ -164 +166 @@
         case IPC_M_DATA_WRITE:
         case IPC_M_DATA_READ:
+        case IPC_M_STATE_CHANGE_AUTHORIZE:
                 return true;
         default:
@@ -334 +337 @@
                 free(answer->buffer);
                 answer->buffer = NULL;
+        } else if (IPC_GET_IMETHOD(*olddata) == IPC_M_STATE_CHANGE_AUTHORIZE) {
+                if (!IPC_GET_RETVAL(answer->data)) {
+                        /* The recipient authorized the change of state. */
+                        phone_t *recipient_phone;
+                        task_t *other_task_s;
+                        task_t *other_task_r;
+                        int rc;
+
+                        rc = phone_get(IPC_GET_ARG1(answer->data),
+                            &recipient_phone);
+                        if (rc != EOK) {
+                                IPC_SET_RETVAL(answer->data, ENOENT);
+                                return ENOENT;
+                        }
+
+                        mutex_lock(&recipient_phone->lock);
+                        if (recipient_phone->state != IPC_PHONE_CONNECTED) {
+                                mutex_unlock(&recipient_phone->lock);
+                                IPC_SET_RETVAL(answer->data, EINVAL);
+                                return EINVAL;
+                        }
+
+                        other_task_r = recipient_phone->callee->task;
+                        other_task_s = (task_t *) IPC_GET_ARG5(*olddata);
+
+                        /*
+                         * See if both the sender and the recipient meant the
+                         * same third party task.
+                         */
+                        if (other_task_r != other_task_s) {
+                                IPC_SET_RETVAL(answer->data, EINVAL);
+                                rc = EINVAL;
+                        } else {
+                                rc = event_task_notify_5(other_task_r,
+                                    EVENT_TASK_STATE_CHANGE, false,
+                                    IPC_GET_ARG1(*olddata),
+                                    IPC_GET_ARG2(*olddata),
+                                    IPC_GET_ARG3(*olddata),
+                                    (sysarg_t) olddata->task,
+                                    (sysarg_t) TASK);
+                                IPC_SET_RETVAL(answer->data, rc);
+                        }
+
+                        mutex_unlock(&recipient_phone->lock);
+                        return rc;
+                }
         }
         
@@ -456 +505 @@
                 }
                 
+                break;
+        }
+        case IPC_M_STATE_CHANGE_AUTHORIZE: {
+                phone_t *sender_phone;
+                task_t *other_task_s;
+
+                if (phone_get(IPC_GET_ARG5(call->data), &sender_phone) != EOK)
+                        return ENOENT;
+
+                mutex_lock(&sender_phone->lock);
+                if (sender_phone->state != IPC_PHONE_CONNECTED) {
+                        mutex_unlock(&sender_phone->lock);
+                        return EINVAL;
+                }
+
+                other_task_s = sender_phone->callee->task;
+
+                mutex_unlock(&sender_phone->lock);
+
+                /* Remember the third party task hash. */
+                IPC_SET_ARG5(call->data, (sysarg_t) other_task_s);
                 break;
         }