Changes in / [df58e44:5b7a107] in mainline

Location:

kernel/generic

Files:

• include/proc/thread.h (modified) (3 diffs)
• src/console/cmd.c (modified) (8 diffs)
• src/proc/scheduler.c (modified) (2 diffs)
• src/proc/thread.c (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -140 +140 @@
         bool interrupted;
         
-        /**
-         * If true, the scheduler will print a stack trace
-         * to the kernel console upon scheduling this thread.
-         */
-        bool btrace;
-        
         /** If true, thread_join_timeout() cannot be used on this thread. */
         bool detached;
@@ -196 +190 @@
         
 #ifdef CONFIG_UDEBUG
+        /**
+         * If true, the scheduler will print a stack trace
+         * to the kernel console upon scheduling this thread.
+         */
+        bool btrace;
+        
         /** Debugging stuff */
         udebug_thread_t udebug;
@@ -245 +245 @@
 extern void thread_update_accounting(bool);
 extern bool thread_exists(thread_t *);
+
+#ifdef CONFIG_UDEBUG
 extern void thread_stack_trace(thread_id_t);
+#endif
 
 /** Fpu context slab cache. */

kernel/generic/src/console/cmd.c

@@ -111 +111 @@
 
 #ifdef CONFIG_TEST
+
 /* Data and methods for 'test' command. */
 static char test_buf[MAX_CMDLINE + 1];
@@ -148 +149 @@
         .argv = bench_argv
 };
-#endif
+
+#endif /* CONFIG_TEST */
 
 /* Data and methods for 'description' command. */
@@ -383 +385 @@
 };
 
+#ifdef CONFIG_UDEBUG
+
 /* Data and methods for 'btrace' command */
 static int cmd_btrace(cmd_arg_t *argv);
@@ -395 +399 @@
         .argv = &btrace_argv
 };
+
+#endif /* CONFIG_UDEBUG */
 
 static int cmd_sched(cmd_arg_t *argv);
@@ -492 +498 @@
 
 static cmd_info_t *basic_commands[] = {
-        &btrace_info,
         &call0_info,
         &mcall0_info,
@@ -523 +528 @@
         &bench_info,
 #endif
+#ifdef CONFIG_UDEBUG
+        &btrace_info,
+#endif
         NULL
 };
@@ -980 +988 @@
 }
 
+#ifdef CONFIG_UDEBUG
+
 /** Command for printing thread stack trace
  *
@@ -992 +1002 @@
         return 1;
 }
+
+#endif /* CONFIG_UDEBUG */
 
 /** Command for printing scheduler information

kernel/generic/src/proc/scheduler.c

@@ -102 +102 @@
 #endif
         
+#ifdef CONFIG_UDEBUG
         if (THREAD->btrace) {
                 istate_t *istate = THREAD->udebug.uspace_state;
@@ -111 +112 @@
                 THREAD->btrace = false;
         }
+#endif
 }
 

kernel/generic/src/proc/thread.c

@@ -338 +338 @@
         
         thread->interrupted = false;
-        thread->btrace = false;
         thread->detached = false;
         waitq_initialize(&thread->join_wq);
@@ -351 +350 @@
         
 #ifdef CONFIG_UDEBUG
-        /* Init debugging stuff */
+        /* Initialize debugging stuff */
+        thread->btrace = false;
         udebug_thread_initialize(&thread->udebug);
 #endif
@@ -752 +752 @@
 }
 
+#ifdef CONFIG_UDEBUG
+
 void thread_stack_trace(thread_id_t thread_id)
 {
@@ -794 +796 @@
         irq_spinlock_unlock(&threads_lock, true);
 }
+
+#endif /* CONFIG_UDEBUG */
 
 /** Process syscall to create new thread.