Changeset 8b5690f in mainline for kernel/generic/include/proc/thread.h

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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 mainline changes.

File:

• kernel/generic/include/proc/thread.h (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -91 +91 @@
         
         /** Function implementing the thread. */
-        void (* thread_code)(void *);
+        void (*thread_code)(void *);
         /** Argument passed to thread_code() function. */
         void *thread_arg;
         
         /**
-         * From here, the stored context is restored when the thread is
-         * scheduled.
+         * From here, the stored context is restored
+         * when the thread is scheduled.
          */
         context_t saved_context;
-        /**
-         * From here, the stored timeout context is restored when sleep times
-         * out.
+        
+        /**
+         * From here, the stored timeout context
+         * is restored when sleep times out.
          */
         context_t sleep_timeout_context;
-        /**
-         * From here, the stored interruption context is restored when sleep is
-         * interrupted.
+        
+        /**
+         * From here, the stored interruption context
+         * is restored when sleep is interrupted.
          */
         context_t sleep_interruption_context;
@@ -125 +127 @@
          */
         bool in_copy_from_uspace;
+        
         /**
          * True if this thread is executing copy_to_uspace().
@@ -187 +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;
@@ -237 +246 @@
 extern bool thread_exists(thread_t *);
 
+#ifdef CONFIG_UDEBUG
+extern void thread_stack_trace(thread_id_t);
+#endif
+
 /** Fpu context slab cache. */
 extern slab_cache_t *fpu_context_slab;