Changeset 3ff2b54 in mainline

Timestamp:

2008-11-22T11:26:53Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7e6c9eb

Parents:

6571b78

Message:

Merge feature from tracing: correct stopping of CPU-intensive tasks in udebug.

Location:

kernel/generic

Files:

• include/udebug/udebug.h (modified) (1 diff)
• src/interrupt/interrupt.c (modified) (1 diff)
• src/time/clock.c (modified) (1 diff)
• src/udebug/udebug.c (modified) (2 diffs)

kernel/generic/include/udebug/udebug.h

@@ -176 +176 @@
         call_t *go_call;
         unative_t syscall_args[6];
+        istate_t *uspace_state;
 
         /** What type of event are we stopped in or 0 if none. */

kernel/generic/src/interrupt/interrupt.c

@@ -87 +87 @@
 {
         ASSERT(n < IVT_ITEMS);
+
+#ifdef CONFIG_UDEBUG
+        if (THREAD) THREAD->udebug.uspace_state = istate;
+#endif
         
         exc_table[n].f(n + IVT_FIRST, istate);
+
+#ifdef CONFIG_UDEBUG
+        if (THREAD) THREAD->udebug.uspace_state = NULL;
+#endif
+
         /* This is a safe place to exit exiting thread */
         if (THREAD && THREAD->interrupted && istate_from_uspace(istate))

kernel/generic/src/time/clock.c

@@ -191 +191 @@
                 if (!ticks && !PREEMPTION_DISABLED) {
                         scheduler();
+#ifdef CONFIG_UDEBUG
+                        /*
+                         * Give udebug chance to stop the thread
+                         * before it begins executing.
+                         */
+                        if (istate_from_uspace(THREAD->udebug.uspace_state))
+                                udebug_before_thread_runs();
+#endif
                 }
         }

kernel/generic/src/udebug/udebug.c

@@ -70 +70 @@
 
         ut->go_call = NULL;
+        ut->uspace_state = NULL;
         ut->go = false;
         ut->stoppable = true;
@@ -232 +233 @@
 /** Upon being scheduled to run, check if the current thread should stop.
  *
- * This function is called from clock(). Preemption is enabled.
- * interrupts are disabled, but since this is called after
- * being scheduled-in, we can enable them, if we're careful enough
- * not to allow arbitrary recursion or deadlock with the thread context.
+ * This function is called from clock().
  */
 void udebug_before_thread_runs(void)
 {
-        ipl_t ipl;
-
-        return;
-
-        ipl = interrupts_enable();
-
-        /* Now we're free to do whatever we need (lock mutexes, sleep, etc.) */
-
         /* Check if we're supposed to stop */
         udebug_stoppable_begin();
         udebug_stoppable_end();
-
-        interrupts_restore(ipl);
 }