X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-events.c;h=9b78ac56f5d43b0fcae0e3d60a38c18965419d04;hb=52cfcdf36dfa58e0b6fb0ac3e1809e5a2538a149;hp=dff93ce6d93c3fabc838c4a33364a185e8a1c562;hpb=8a8ac9a87ae1ddffad34d96a66be224e8c8d89e4;p=lttng-modules.git

diff --git a/src/lttng-events.c b/src/lttng-events.c
index dff93ce6..9b78ac56 100644
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -36,6 +36,7 @@
 #include <wrapper/types.h>
 #include <lttng/kernel-version.h>
 #include <lttng/events.h>
+#include <lttng/lttng-bytecode.h>
 #include <lttng/tracer.h>
 #include <lttng/event-notifier-notification.h>
 #include <lttng/abi-old.h>
@@ -819,7 +820,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 	event->id = chan->free_event_id++;
 	event->instrumentation = itype;
 	event->evtype = LTTNG_TYPE_EVENT;
-	INIT_LIST_HEAD(&event->bytecode_runtime_head);
+	INIT_LIST_HEAD(&event->filter_bytecode_runtime_head);
 	INIT_LIST_HEAD(&event->enablers_ref_head);
 
 	switch (itype) {
@@ -1051,7 +1052,7 @@ struct lttng_event_notifier *_lttng_event_notifier_create(
 	event_notifier->instrumentation = itype;
 	event_notifier->evtype = LTTNG_TYPE_EVENT;
 	event_notifier->send_notification = lttng_event_notifier_notification_send;
-	INIT_LIST_HEAD(&event_notifier->bytecode_runtime_head);
+	INIT_LIST_HEAD(&event_notifier->filter_bytecode_runtime_head);
 	INIT_LIST_HEAD(&event_notifier->enablers_ref_head);
 
 	switch (itype) {
@@ -2030,8 +2031,8 @@ int lttng_event_enabler_ref_events(struct lttng_event_enabler *event_enabler)
 		 */
 		lttng_enabler_link_bytecode(event->desc,
 			lttng_static_ctx,
-			&event->bytecode_runtime_head,
-			lttng_event_enabler_as_enabler(event_enabler));
+			&event->filter_bytecode_runtime_head,
+			&lttng_event_enabler_as_enabler(event_enabler)->filter_bytecode_head);
 
 		/* TODO: merge event context. */
 	}
@@ -2117,8 +2118,8 @@ int lttng_event_notifier_enabler_ref_event_notifiers(
 		 * Link filter bytecodes if not linked yet.
 		 */
 		lttng_enabler_link_bytecode(event_notifier->desc,
-			lttng_static_ctx, &event_notifier->bytecode_runtime_head,
-			lttng_event_notifier_enabler_as_enabler(event_notifier_enabler));
+			lttng_static_ctx, &event_notifier->filter_bytecode_runtime_head,
+			&lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)->filter_bytecode_head);
 	}
 	return 0;
 }
@@ -2214,17 +2215,17 @@ int lttng_event_enabler_disable(struct lttng_event_enabler *event_enabler)
 }
 
 static
-int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
+int lttng_enabler_attach_filter_bytecode(struct lttng_enabler *enabler,
 		struct lttng_kernel_filter_bytecode __user *bytecode)
 {
-	struct lttng_filter_bytecode_node *bytecode_node;
+	struct lttng_bytecode_node *bytecode_node;
 	uint32_t bytecode_len;
 	int ret;
 
 	ret = get_user(bytecode_len, &bytecode->len);
 	if (ret)
 		return ret;
-	bytecode_node = kzalloc(sizeof(*bytecode_node) + bytecode_len,
+	bytecode_node = lttng_kvzalloc(sizeof(*bytecode_node) + bytecode_len,
 			GFP_KERNEL);
 	if (!bytecode_node)
 		return -ENOMEM;
@@ -2233,6 +2234,7 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
 	if (ret)
 		goto error_free;
 
+	bytecode_node->type = LTTNG_BYTECODE_NODE_TYPE_FILTER;
 	bytecode_node->enabler = enabler;
 	/* Enforce length based on allocated size */
 	bytecode_node->bc.len = bytecode_len;
@@ -2241,15 +2243,15 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
 	return 0;
 
 error_free:
-	kfree(bytecode_node);
+	lttng_kvfree(bytecode_node);
 	return ret;
 }
 
-int lttng_event_enabler_attach_bytecode(struct lttng_event_enabler *event_enabler,
+int lttng_event_enabler_attach_filter_bytecode(struct lttng_event_enabler *event_enabler,
 		struct lttng_kernel_filter_bytecode __user *bytecode)
 {
 	int ret;
-	ret = lttng_enabler_attach_bytecode(
+	ret = lttng_enabler_attach_filter_bytecode(
 		lttng_event_enabler_as_enabler(event_enabler), bytecode);
 	if (ret)
 		goto error;
@@ -2282,12 +2284,12 @@ int lttng_event_enabler_attach_context(struct lttng_event_enabler *event_enabler
 static
 void lttng_enabler_destroy(struct lttng_enabler *enabler)
 {
-	struct lttng_filter_bytecode_node *filter_node, *tmp_filter_node;
+	struct lttng_bytecode_node *filter_node, *tmp_filter_node;
 
 	/* Destroy filter bytecode */
 	list_for_each_entry_safe(filter_node, tmp_filter_node,
 			&enabler->filter_bytecode_head, node) {
-		kfree(filter_node);
+		lttng_kvfree(filter_node);
 	}
 }
 
@@ -2354,13 +2356,13 @@ int lttng_event_notifier_enabler_disable(
 	return 0;
 }
 
-int lttng_event_notifier_enabler_attach_bytecode(
+int lttng_event_notifier_enabler_attach_filter_bytecode(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		struct lttng_kernel_filter_bytecode __user *bytecode)
 {
 	int ret;
 
-	ret = lttng_enabler_attach_bytecode(
+	ret = lttng_enabler_attach_filter_bytecode(
 		lttng_event_notifier_enabler_as_enabler(event_notifier_enabler),
 		bytecode);
 	if (ret)
@@ -2478,8 +2480,8 @@ void lttng_session_sync_event_enablers(struct lttng_session *session)
 
 		/* Enable filters */
 		list_for_each_entry(runtime,
-				&event->bytecode_runtime_head, node)
-			lttng_filter_sync_state(runtime);
+				&event->filter_bytecode_runtime_head, node)
+			lttng_bytecode_filter_sync_state(runtime);
 	}
 }
 
@@ -2561,8 +2563,8 @@ void lttng_event_notifier_group_sync_enablers(struct lttng_event_notifier_group
 
 		/* Enable filters */
 		list_for_each_entry(runtime,
-				&event_notifier->bytecode_runtime_head, node)
-			lttng_filter_sync_state(runtime);
+				&event_notifier->filter_bytecode_runtime_head, node)
+			lttng_bytecode_filter_sync_state(runtime);
 	}
 }