-#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)
+#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)
+
+/* flags for sample calls */