xnu-1504.9.37.tar.gz

[apple/xnu.git] / osfmk / kern / debug.h

diff --git a/osfmk/kern/debug.h b/osfmk/kern/debug.h
index d4ad172b9eb281f489d5fda3ffefd439834f3e8d..308435ece684501fc7a48d4f017dd3f6a63253fc 100644 (file)
--- a/osfmk/kern/debug.h
+++ b/osfmk/kern/debug.h
@@ -39,12 +39,18 @@ struct thread_snapshot {
        uint32_t                snapshot_magic;
        uint32_t                nkern_frames;
        uint32_t                nuser_frames;
        uint32_t                snapshot_magic;
        uint32_t                nkern_frames;
        uint32_t                nuser_frames;

-       int32_t                 pid;

        uint64_t                wait_event;
        uint64_t                continuation;
        uint64_t                thread_id;
        int32_t                 state;
        char                    ss_flags;
        uint64_t                wait_event;
        uint64_t                continuation;
        uint64_t                thread_id;
        int32_t                 state;
        char                    ss_flags;

+} __attribute__ ((packed));
+
+struct task_snapshot {
+       uint32_t                snapshot_magic;
+       int32_t                 pid;
+       uint32_t                nloadinfos;
+       char                    ss_flags;

        /* We restrict ourselves to a statically defined
         * (current as of 2009) length for the
         * p_comm string, due to scoping issues (osfmk/bsd and user/kernel
        /* We restrict ourselves to a statically defined
         * (current as of 2009) length for the
         * p_comm string, due to scoping issues (osfmk/bsd and user/kernel


@@ -59,9 +65,13 @@ enum {
        kHasDispatchSerial = 0x4
 };
 
        kHasDispatchSerial = 0x4
 };
 

-enum   {STACKSHOT_GET_DQ = 1};
-#define STACKSHOT_DISPATCH_OFFSET_MASK 0xffff0000
-#define STACKSHOT_DISPATCH_OFFSET_SHIFT 16 
+enum {
+    STACKSHOT_GET_DQ = 0x1,
+    STACKSHOT_SAVE_LOADINFO = 0x2
+};
+
+#define STACKSHOT_THREAD_SNAPSHOT_MAGIC 0xfeedface
+#define STACKSHOT_TASK_SNAPSHOT_MAGIC 0xdecafbad

 
 #endif /* __APPLE_API_UNSTABLE */
 #endif /* __APPLE_API_PRIVATE */
 
 #endif /* __APPLE_API_UNSTABLE */
 #endif /* __APPLE_API_PRIVATE */


@@ -70,6 +80,7 @@ enum  {STACKSHOT_GET_DQ = 1};
 
 extern unsigned int    systemLogDiags;
 extern char debug_buf[];
 
 extern unsigned int    systemLogDiags;
 extern char debug_buf[];

+extern unsigned int    debug_boot_arg;

 
 #ifdef MACH_KERNEL_PRIVATE
 
 
 #ifdef MACH_KERNEL_PRIVATE