X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Fevent.h;h=b89590dbde01c44d402979afc27d045ea01a0fab;hb=c19092cd4d6af49c38322fc55ca91f17f03f32ac;hp=bf37a116792d0961703b39ef494589fde12aa5d9;hpb=f086e50e4e5c70f43f9b0f707078694eadc5ccd5;p=lttng-tools.git

diff --git a/include/lttng/event.h b/include/lttng/event.h
index bf37a1167..b89590dbd 100644
--- a/include/lttng/event.h
+++ b/include/lttng/event.h
@@ -138,6 +138,12 @@ enum lttng_event_context_type {
 	LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER	= 13,
 	LTTNG_EVENT_CONTEXT_PERF_THREAD_COUNTER = 14,
 	LTTNG_EVENT_CONTEXT_APP_CONTEXT		= 15,
+	LTTNG_EVENT_CONTEXT_INTERRUPTIBLE	= 16,
+	LTTNG_EVENT_CONTEXT_PREEMPTIBLE		= 17,
+	LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE	= 18,
+	LTTNG_EVENT_CONTEXT_MIGRATABLE		= 19,
+	LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL	= 20,
+	LTTNG_EVENT_CONTEXT_CALLSTACK_USER	= 21, /* Supported on x86_32 and x86_64 only. */
 };
 
 enum lttng_event_field_type {
@@ -261,7 +267,7 @@ struct lttng_event {
 
 	/* Offset 288 */
 	union {
-		char padding[8];
+		uint64_t padding;
 		void *ptr;
 	} extended;
 
@@ -296,15 +302,16 @@ extern int lttng_list_events(struct lttng_handle *handle,
 		const char *channel_name, struct lttng_event **events);
 
 /*
- * Get the filter string of a specific LTTng event.
+ * Get the filter expression of a specific LTTng event.
  *
- * If the call is successful, then the filter string's address is put
- * in *filter_string. If the event has no filter string, *filter_string
- * is set to NULL. The caller does NOT own *filter_string.
+ * If the call is successful, then the filter expression's address is put
+ * in *filter_expression. If the event has no filter expression,
+ * *filter_expression is set to NULL. The caller does NOT own
+ * *filter_expression.
  *
  * Returns 0 on success, or a negative LTTng error code on error.
  */
-extern int lttng_event_get_filter_string(struct lttng_event *event,
+extern int lttng_event_get_filter_expression(struct lttng_event *event,
 		const char **filter_string);
 
 /*