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

diff --git a/include/lttng/event.h b/include/lttng/event.h
index bf37a1167..3f260c0a5 100644
--- a/include/lttng/event.h
+++ b/include/lttng/event.h
@@ -24,6 +24,7 @@ extern "C" {
 #endif
 
 #include <lttng/handle.h>
+#include <lttng/userspace-probe.h>
 
 /*
  * Instrumentation type of tracing event.
@@ -36,6 +37,7 @@ enum lttng_event_type {
 	LTTNG_EVENT_FUNCTION_ENTRY            = 3,
 	LTTNG_EVENT_NOOP                      = 4,
 	LTTNG_EVENT_SYSCALL                   = 5,
+	LTTNG_EVENT_USERSPACE_PROBE           = 6,
 };
 
 /*
@@ -138,6 +140,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 +269,7 @@ struct lttng_event {
 
 	/* Offset 288 */
 	union {
-		char padding[8];
+		uint64_t padding;
 		void *ptr;
 	} extended;
 
@@ -295,16 +303,23 @@ struct lttng_event_field {
 extern int lttng_list_events(struct lttng_handle *handle,
 		const char *channel_name, struct lttng_event **events);
 
+extern struct lttng_event *lttng_event_create(void);
+
+extern struct lttng_event *lttng_event_copy(const struct lttng_event *event);
+
+extern void lttng_event_destroy(struct lttng_event *event);
+
 /*
- * 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);
 
 /*
@@ -326,6 +341,26 @@ extern int lttng_event_get_exclusion_name_count(struct lttng_event *event);
 extern int lttng_event_get_exclusion_name(struct lttng_event *event,
 		size_t index, const char **exclusion_name);
 
+
+/*
+ * Get the userspace probe location of a specific LTTng event.
+ * If the call is successful, then a pointer to the probe location is returned.
+ * If the event has no probe location a NULL pointer is returned. The caller
+ * does not own the returned probe location.
+ */
+extern const struct lttng_userspace_probe_location *
+lttng_event_get_userspace_probe_location(const struct lttng_event *event);
+
+/*
+ * Set an LTTng event's userspace probe location.
+ * If the call is successful, then the probe location is set to the event. The
+ * ownership of the probe_location is given to the event.
+ *
+ * Returns 0 on success, or a negative LTTng error code on error.
+ */
+extern int lttng_event_set_userspace_probe_location(struct lttng_event *event,
+		struct lttng_userspace_probe_location *probe_location);
+
 /*
  * List the available tracepoints of a specific lttng domain.
  *