X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fust-events.h;h=5edfbb99f88019565669adaf735cefa2e6cc3b12;hb=d71b57b9079172d8d835ae082087feb57991201f;hp=65f502360372638749d6ed77fcaa2d55d91b4344;hpb=9501d22f55b3a23f382f631c99b2325d1419b5da;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 65f50236..5edfbb99 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -212,7 +212,7 @@ struct lttng_ctx {
 #define LTTNG_UST_EVENT_DESC_PADDING	40
 struct lttng_event_desc {
 	const char *name;
-	void *probe_callback;
+	void (*probe_callback)(void);
 	const struct lttng_event_ctx *ctx;	/* context */
 	const struct lttng_event_field *fields;	/* event payload */
 	unsigned int nr_fields;
@@ -271,7 +271,18 @@ struct lttng_ust_tracepoint_list {
 	struct cds_list_head head;
 };
 
+struct tp_field_list_entry {
+	struct lttng_ust_field_iter field;
+	struct cds_list_head head;
+};
+
+struct lttng_ust_field_list {
+	struct tp_field_list_entry *iter;
+	struct cds_list_head head;
+};
+
 struct ust_pending_probe;
+struct ltt_event;
 
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
@@ -282,7 +293,7 @@ struct ltt_event {
 	struct ltt_channel *chan;
 	int enabled;
 	const struct lttng_event_desc *desc;
-	void *filter;
+	void (*filter)(struct ltt_event *event);
 	struct lttng_ctx *ctx;
 	enum lttng_ust_instrumentation instrumentation;
 	union {
@@ -402,7 +413,7 @@ struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
 
 int ltt_event_create(struct ltt_channel *chan,
 		struct lttng_ust_event *event_param,
-		void *filter,
+		void (*filter)(struct ltt_event *event),
 		struct ltt_event **event);
 
 int ltt_channel_enable(struct ltt_channel *channel);
@@ -434,9 +445,9 @@ int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
 void lttng_context_vtid_reset(void);
 void lttng_context_vpid_reset(void);
 
-const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
-const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
-const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
+extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
+extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
+extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
 
 struct ltt_transport *ltt_transport_find(const char *name);
 
@@ -444,6 +455,10 @@ int ltt_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
 void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
 struct lttng_ust_tracepoint_iter *
 	lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
+int ltt_probes_get_field_list(struct lttng_ust_field_list *list);
+void ltt_probes_prune_field_list(struct lttng_ust_field_list *list);
+struct lttng_ust_field_iter *
+	lttng_ust_field_list_get_iter_next(struct lttng_ust_field_list *list);
 
 int ltt_wildcard_enable(struct session_wildcard *wildcard);
 int ltt_wildcard_disable(struct session_wildcard *wildcard);