Changeset 9a1b20c in mainline for kernel/generic/src/ipc

Timestamp:

2008-09-17T12:16:27Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

fb9b0b0

Parents:

06a195bc

Message:

Merge syscall tracer (trace) and relevant part of udebug interface from tracing to trunk.

Location:

kernel/generic/src/ipc

Files:

• ipc.c (modified) (6 diffs)
• ipc_kbox.c (added)
• sysipc.c (modified) (10 diffs)

kernel/generic/src/ipc/ipc.c

@@ -44 +44 @@
 #include <synch/synch.h>
 #include <ipc/ipc.h>
+#include <ipc/ipc_kbox.h>
 #include <errno.h>
 #include <mm/slab.h>
@@ -52 +53 @@
 
 #include <print.h>
+#include <console/console.h>
 #include <proc/thread.h>
 #include <arch/interrupt.h>
@@ -428 +430 @@
  * @param lst           Head of the list to be cleaned up.
  */
-static void ipc_cleanup_call_list(link_t *lst)
+void ipc_cleanup_call_list(link_t *lst)
 {
         call_t *call;
@@ -443 +445 @@
 }
 
+/** Disconnects all phones connected to an answerbox.
+ *
+ * @param box           Answerbox to disconnect phones from.
+ * @param notify_box    If true, the answerbox will get a hangup message for
+ *                      each disconnected phone.
+ */
+void ipc_answerbox_slam_phones(answerbox_t *box, bool notify_box)
+{
+        phone_t *phone;
+        DEADLOCK_PROBE_INIT(p_phonelck);
+        ipl_t ipl;
+        call_t *call;
+
+        call = notify_box ? ipc_call_alloc(0) : NULL;
+
+        /* Disconnect all phones connected to our answerbox */
+restart_phones:
+        ipl = interrupts_disable();
+        spinlock_lock(&box->lock);
+        while (!list_empty(&box->connected_phones)) {
+                phone = list_get_instance(box->connected_phones.next,
+                    phone_t, link);
+                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
+                        spinlock_unlock(&box->lock);
+                        interrupts_restore(ipl);
+                        DEADLOCK_PROBE(p_phonelck, DEADLOCK_THRESHOLD);
+                        goto restart_phones;
+                }
+                
+                /* Disconnect phone */
+                ASSERT(phone->state == IPC_PHONE_CONNECTED);
+
+                list_remove(&phone->link);
+                phone->state = IPC_PHONE_SLAMMED;
+
+                if (notify_box) {
+                        mutex_unlock(&phone->lock);
+                        spinlock_unlock(&box->lock);
+                        interrupts_restore(ipl);
+
+                        /*
+                         * Send one message to the answerbox for each
+                         * phone. Used to make sure the kbox thread
+                         * wakes up after the last phone has been
+                         * disconnected.
+                         */
+                        IPC_SET_METHOD(call->data, IPC_M_PHONE_HUNGUP);
+                        call->flags |= IPC_CALL_DISCARD_ANSWER;
+                        _ipc_call(phone, box, call);
+
+                        /* Allocate another call in advance */
+                        call = ipc_call_alloc(0);
+
+                        /* Must start again */
+                        goto restart_phones;
+                }
+
+                mutex_unlock(&phone->lock);
+        }
+
+        spinlock_unlock(&box->lock);
+        interrupts_restore(ipl);
+
+        /* Free unused call */
+        if (call) ipc_call_free(call);
+}
+
 /** Cleans up all IPC communication of the current task.
  *
@@ -452 +521 @@
         int i;
         call_t *call;
-        phone_t *phone;
-        DEADLOCK_PROBE_INIT(p_phonelck);
 
         /* Disconnect all our phones ('ipc_phone_hangup') */
@@ -462 +529 @@
         ipc_irq_cleanup(&TASK->answerbox);
 
-        /* Disconnect all phones connected to our answerbox */
-restart_phones:
+        /* Disconnect all phones connected to our regular answerbox */
+        ipc_answerbox_slam_phones(&TASK->answerbox, false);
+
+#ifdef CONFIG_UDEBUG
+        /* Clean up kbox thread and communications */
+        ipc_kbox_cleanup();
+#endif
+
+        /* Answer all messages in 'calls' and 'dispatched_calls' queues */
         spinlock_lock(&TASK->answerbox.lock);
-        while (!list_empty(&TASK->answerbox.connected_phones)) {
-                phone = list_get_instance(TASK->answerbox.connected_phones.next,
-                    phone_t, link);
-                if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {
-                        spinlock_unlock(&TASK->answerbox.lock);
-                        DEADLOCK_PROBE(p_phonelck, DEADLOCK_THRESHOLD);
-                        goto restart_phones;
-                }
-                
-                /* Disconnect phone */
-                ASSERT(phone->state == IPC_PHONE_CONNECTED);
-                phone->state = IPC_PHONE_SLAMMED;
-                list_remove(&phone->link);
-
-                mutex_unlock(&phone->lock);
-        }
-
-        /* Answer all messages in 'calls' and 'dispatched_calls' queues */
         ipc_cleanup_call_list(&TASK->answerbox.dispatched_calls);
         ipc_cleanup_call_list(&TASK->answerbox.calls);

kernel/generic/src/ipc/sysipc.c

@@ -43 +43 @@
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
+#include <ipc/ipc_kbox.h>
+#include <udebug/udebug_ipc.h>
 #include <arch/interrupt.h>
 #include <print.h>
@@ -296 +298 @@
  *
  * @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;
@@ -341 +344 @@
                 }
                 break;
+#ifdef CONFIG_UDEBUG
+        case IPC_M_DEBUG_ALL:
+                return udebug_request_preprocess(call, phone);
+#endif
         default:
                 break;
@@ -370 +377 @@
         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);
@@ -400 +408 @@
                 }
                 IPC_SET_ARG5(call->data, phoneid);
-        } 
+        }
+        switch (IPC_GET_METHOD(call->data)) {
+        case IPC_M_DEBUG_ALL:
+                return -1;
+        default:
+                break;
+        }
         return 0;
 }
@@ -442 +456 @@
         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)
@@ -482 +496 @@
         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)
@@ -551 +565 @@
         IPC_SET_ARG5(call->data, 0);
 
-        if (!(res = request_preprocess(call)))
+        if (!(res = request_preprocess(call, phone)))
                 ipc_call(phone, call);
         else
@@ -585 +599 @@
                 return (unative_t) rc;
         }
-        if (!(res = request_preprocess(call)))
+        if (!(res = request_preprocess(call, phone)))
                 ipc_call(phone, call);
         else
@@ -869 +883 @@
 }
 
+#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;
+
+        printf("sys_ipc_connect_kbox(%lld, %d)\n", taskid_arg.value);
+
+        return ipc_connect_kbox(taskid_arg.value);
+#else
+        return (unative_t) ENOTSUP;
+#endif
+}
+
 /** @}
  */