Changeset fea0ce6 in mainline for kernel/generic/include

Timestamp:

2010-01-23T20:20:54Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e095644

Parents:

9d3133d (diff), bc310a05 (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 task dump infrastructure.

Location:

kernel/generic/include

Files:

• interrupt.h (modified) (1 diff)
• ipc/event_types.h (modified) (1 diff)
• mm/as.h (modified) (3 diffs)
• udebug/udebug.h (modified) (3 diffs)
• udebug/udebug_ops.h (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -46 +46 @@
 typedef void (* iroutine)(int n, istate_t *istate);
 
-#define fault_if_from_uspace(istate, fmt, ...) \
-{ \
-        if (istate_from_uspace(istate)) { \
-                task_t *task = TASK; \
-                printf("Task %s (%" PRIu64 ") killed due to an exception at " \
-                    "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \
-                stack_trace_istate(istate); \
-                printf("Kill message: " fmt "\n", ##__VA_ARGS__); \
-                task_kill(task->taskid); \
-                thread_exit(); \
-        } \
-}
-
+extern void fault_if_from_uspace(istate_t *istate, char *fmt, ...);
 extern iroutine exc_register(int n, const char *name, iroutine f);
 extern void exc_dispatch(int n, istate_t *t);

kernel/generic/include/ipc/event_types.h

@@ -37 +37 @@
 
 typedef enum event_type {
+        /** New data available in kernel log */
         EVENT_KLOG = 0,
+        /** Returning from kernel console to userspace */
         EVENT_KCONSOLE,
+        /** A thread has faulted and will be terminated */
+        EVENT_FAULT,
         EVENT_END
 } event_type_t;

kernel/generic/include/mm/as.h

@@ -36 +36 @@
 #define KERN_AS_H_
 
+#ifdef KERNEL
+#include <arch/types.h>
+#else
+#include <sys/types.h>
+#endif
+
 /** Address space area flags. */
 #define AS_AREA_READ            1
@@ -41 +47 @@
 #define AS_AREA_EXEC            4
 #define AS_AREA_CACHEABLE       8
+
+/** Address space area info exported to userspace. */
+typedef struct {
+        /** Starting address */
+        uintptr_t start_addr;
+
+        /** Area size */
+        size_t size;
+
+        /** Area flags */
+        int flags;
+} as_area_info_t;
 
 #ifdef KERNEL
@@ -268 +286 @@
 
 /* Introspection functions. */
+extern void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize);
 extern void as_print(as_t *as);
 

kernel/generic/include/udebug/udebug.h

@@ -96 +96 @@
  */
 UDEBUG_M_THREAD_READ,
+
+/** Read the list of the debugged task's address space areas.
+ *
+ * - ARG2 - destination address in the caller's address space
+ * - ARG3 - size of receiving buffer in bytes
+ *
+ * The kernel fills the buffer with a series of as_area_info_t structures.
+ * Upon answer, the kernel will set:
+ *
+ * - ARG2 - number of bytes that were actually copied
+ * - ARG3 - number of bytes of the complete data
+ *
+ */
+UDEBUG_M_AREAS_READ,
 
 /** Read the debugged tasks's memory.
@@ -139 +153 @@
 
 #include <synch/mutex.h>
+#include <synch/condvar.h>
 #include <arch/interrupt.h>
 #include <atomic.h>
@@ -181 +196 @@
         bool stoppable;         /**< thread is stoppable */
         bool active;            /**< thread is in a debugging session */
+        condvar_t active_cv;
 } udebug_thread_t;
 

kernel/generic/include/udebug/udebug_ops.h

@@ -45 +45 @@
 int udebug_stop(thread_t *t, call_t *call);
 
-int udebug_thread_read(void **buffer, size_t buf_size, size_t *n);
+int udebug_thread_read(void **buffer, size_t buf_size, size_t *stored,
+    size_t *needed);
 int udebug_args_read(thread_t *t, void **buffer);