WebSVN – HelenOS – Diff – /branches/sparc/kernel/generic/src/ipc/sysipc.c

 #include <debug.h>
 #include <ipc/ipc.h>
 #include <ipc/sysipc.h>
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
+#include <ipc/kbox.h>
+#include <udebug/udebug_ipc.h>
 #include <arch/interrupt.h>
-#include <print.h>
 #include <syscall/copy.h>
 #include <security/cap.h>
 #include <mm/as.h>
 #include <print.h>
+}
 /** Called before the request is sent.
+ *
  * @param call      Call structure with the request.
+ * @param phone     Phone that the call will be sent through.
+ *
  * @return      Return 0 on success, ELIMIT or EPERM on error.
  */
-static int request_preprocess(call_t *call)
+static int request_preprocess(call_t *call, phone_t *phone)
+{
     int newphid;
     size_t size;
     uintptr_t src;
     int rc;
         if (rc != 0) {
             free(call->buffer);
             return rc;
+        }
         break;
+#ifdef CONFIG_UDEBUG
+    case IPC_M_DEBUG_ALL:
+        return udebug_request_preprocess(call, phone);
+#endif
     default:
         break;
+    }
     return 0;
+}
             IPC_SET_ARG5(call->data, call->priv);
+    }
     if (call->buffer) {
         /* This must be an affirmative answer to IPC_M_DATA_READ. */
+        /* or IPC_M_DEBUG_ALL/UDEBUG_M_MEM_READ... */
         uintptr_t dst = IPC_GET_ARG1(call->data);
         size_t size = IPC_GET_ARG2(call->data);
         int rc = copy_to_uspace((void *) dst, call->buffer, size);
         if (rc)
             IPC_SET_RETVAL(call->data, rc);
             ipc_answer(box, call);
             return -1;
+        }
         IPC_SET_ARG5(call->data, phoneid);
+    }
+    switch (IPC_GET_METHOD(call->data)) {
+    case IPC_M_DEBUG_ALL:
+        return -1;
+    default:
+        break;
+    }
     return 0;
+}
 /** Make a fast call over IPC, wait for reply and return to user.
+ *
      * the limits of the fast version.
      */
     IPC_SET_ARG4(call.data, 0);
     IPC_SET_ARG5(call.data, 0);
-    if (!(res = request_preprocess(&call))) {
+    if (!(res = request_preprocess(&call, phone))) {
         rc = ipc_call_sync(phone, &call);
         if (rc != EOK)
             return rc;
         process_answer(&call);
     } else {
     if (rc != 0)
         return (unative_t) rc;
     GET_CHECK_PHONE(phone, phoneid, return ENOENT);
-    if (!(res = request_preprocess(&call))) {
+    if (!(res = request_preprocess(&call, phone))) {
         rc = ipc_call_sync(phone, &call);
         if (rc != EOK)
             return rc;
         process_answer(&call);
     } else
      * To achieve deterministic behavior, zero out arguments that are beyond
      * the limits of the fast version.
      */
     IPC_SET_ARG5(call->data, 0);
-    if (!(res = request_preprocess(call)))
+    if (!(res = request_preprocess(call, phone)))
         ipc_call(phone, call);
     else
         ipc_backsend_err(phone, call, res);
     return (unative_t) call;
         sizeof(call->data.args));
     if (rc != 0) {
         ipc_call_free(call);
         return (unative_t) rc;
+    }
-    if (!(res = request_preprocess(call)))
+    if (!(res = request_preprocess(call, phone)))
         ipc_call(phone, call);
     else
         ipc_backsend_err(phone, call, res);
     return (unative_t) call;
     if (call->flags & IPC_CALL_ANSWERED) {
         process_answer(call);
         ASSERT(! (call->flags & IPC_CALL_STATIC_ALLOC));
-        atomic_dec(&TASK->active_calls);
         if (call->flags & IPC_CALL_DISCARD_ANSWER) {
             ipc_call_free(call);
             goto restart;
+        } else {
+            /*
+             * Decrement the counter of active calls only if the
+             * call is not an answer to IPC_M_PHONE_HUNGUP,
+             * which doesn't contribute to the counter.
+             */
+            atomic_dec(&TASK->active_calls);
+        }
         STRUCT_TO_USPACE(&calldata->args, &call->data.args);
         ipc_call_free(call);
     ipc_irq_unregister(&TASK->answerbox, inr, devno);
     return 0;
+}
+#include <console/console.h>
+/**
+ * Syscall connect to a task by id.
+ *
+ * @return      Phone id on success, or negative error code.
+ */
+unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
+{
+#ifdef CONFIG_UDEBUG
+    sysarg64_t taskid_arg;
+    int rc;
+    rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
+    if (rc != 0)
+        return (unative_t) rc;
+    LOG("sys_ipc_connect_kbox(%" PRIu64 ")\n", taskid_arg.value);
+    return ipc_connect_kbox(taskid_arg.value);
+#else
+    return (unative_t) ENOTSUP;
+#endif
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/sparc/kernel/generic/src/ipc/sysipc.c @ 3664 – Rev 3397 → 3492