Changeset 2b96463 in mainline for kernel/generic/include

Timestamp:

2011-01-28T15:15:11Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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

Location:

kernel/generic/include

Files:

• debug.h (modified) (2 diffs)
• ipc/ipc.h (modified) (4 diffs)
• proc/thread.h (modified) (4 diffs)

kernel/generic/include/debug.h

@@ -55 +55 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s", #expr); \
+                        panic_assert("%s() at %s:%u:\n%s", \
+                            __func__, __FILE__, __LINE__, #expr); \
         } while (0)
 
@@ -72 +73 @@
         do { \
                 if (!(expr)) \
-                        panic_assert("%s, %s", #expr, msg); \
+                        panic_assert("%s() at %s:%u:\n%s, %s", \
+                            __func__, __FILE__, __LINE__, #expr, msg); \
         } while (0)
 

kernel/generic/include/ipc/ipc.h

@@ -165 +165 @@
  *                       error is sent back to caller. Otherwise 
  *                       the call is accepted and the response is sent back.
- *                     - the allocated phoneid is passed to userspace 
+ *                     - the hash of the client task is passed to userspace
+ *                       (on the receiving side) as ARG4 of the call.
+ *                     - the hash of the allocated phone is passed to userspace
  *                       (on the receiving side) as ARG5 of the call.
  *
@@ -319 +321 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
+        /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
+        struct task *task;
+        /** Phone which made or last masqueraded this call. */
         phone_t *phone;
 } ipc_data_t;
@@ -333 +338 @@
          * The caller box is different from sender->answerbox
          * for synchronous calls.
-         *
          */
         answerbox_t *callerbox;
@@ -350 +354 @@
          * cases, we must keep it aside so that the answer is processed
          * correctly.
-         *
          */
         phone_t *caller_phone;

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;