-#define SAMPLER_TINFO (1<<0)
-#define SAMPLER_TINFOEX (1<<1)
-#define SAMPLER_KSTACK (1<<2)
-#define SAMPLER_USTACK (1<<3)
-#define SAMPLER_PMC_THREAD (1<<4)
-#define SAMPLER_PMC_CPU (1<<5)
-#define SAMPLER_PMC_CONFIG (1<<6)
-#define SAMPLER_MEMINFO (1<<7)
-
-/* flags for sample calls*/
-#define SAMPLE_FLAG_PEND_USER (1<<0)
-#define SAMPLE_FLAG_IDLE_THREADS (1<<1)
-#define SAMPLE_FLAG_EMPTY_CALLSTACK (1<<2)
+#define SAMPLER_TH_INFO (1U << 0)
+#define SAMPLER_TH_SNAPSHOT (1U << 1)
+#define SAMPLER_KSTACK (1U << 2)
+#define SAMPLER_USTACK (1U << 3)
+#define SAMPLER_PMC_THREAD (1U << 4)
+#define SAMPLER_PMC_CPU (1U << 5)
+#define SAMPLER_PMC_CONFIG (1U << 6)
+#define SAMPLER_MEMINFO (1U << 7)
+#define SAMPLER_TH_SCHEDULING (1U << 8)
+#define SAMPLER_TH_DISPATCH (1U << 9)
+#define SAMPLER_TK_SNAPSHOT (1U << 10)
+#define SAMPLER_SYS_MEM (1U << 11)
+#define SAMPLER_TH_INSCYC (1U << 12)
+#define SAMPLER_TK_INFO (1U << 13)
+
+#define SAMPLER_TASK_MASK (SAMPLER_MEMINFO | SAMPLER_TK_SNAPSHOT | \
+ SAMPLER_TK_INFO)
+#define SAMPLER_THREAD_MASK (SAMPLER_TH_INFO | SAMPLER_TH_SNAPSHOT | \
+ SAMPLER_KSTACK | SAMPLER_USTACK | SAMPLER_PMC_THREAD | \
+ SAMPLER_TH_SCHEDULING | SAMPLER_TH_DISPATCH | SAMPLER_TH_INSCYC)
+
+/* flags for sample calls */
+
+/* pend samplers requiring copyin until AST boundary */
+#define SAMPLE_FLAG_PEND_USER (1U << 0)
+/* sample idle threads */
+#define SAMPLE_FLAG_IDLE_THREADS (1U << 1)
+/* do not sample callstacks */
+#define SAMPLE_FLAG_EMPTY_CALLSTACK (1U << 2)
+/* use the continuation as a kernel backtrace */
+#define SAMPLE_FLAG_CONTINUATION (1U << 3)
+/* sample is occurring outside of interrupt context */
+#define SAMPLE_FLAG_NON_INTERRUPT (1U << 4)
+/* sample should include system samplers */
+#define SAMPLE_FLAG_SYSTEM (1U << 5)
+/* sample should not include non-system samplers */
+#define SAMPLE_FLAG_ONLY_SYSTEM (1U << 6)
+/* sample should only include task samplers */
+#define SAMPLE_FLAG_TASK_ONLY (1U << 7)
+/* sample should only include thread samplers */
+#define SAMPLE_FLAG_THREAD_ONLY (1U << 8)