X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Ftracepoint.c;h=93de1e98ce936c28ffe1dfb6a634595e51b8353b;hb=cb6096aac522cc9b005eb704d40c6aac00e384ab;hp=6bdb754bc98f5f7917dbeb93bd59f0b10f8b663b;hpb=993578ff7c4fce4d9a834918d192f896ba3021c7;p=lttng-tools.git

diff --git a/src/common/event-rule/tracepoint.c b/src/common/event-rule/tracepoint.c
index 6bdb754bc..93de1e98c 100644
--- a/src/common/event-rule/tracepoint.c
+++ b/src/common/event-rule/tracepoint.c
@@ -16,6 +16,7 @@
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/tracepoint-internal.h>
+#include <lttng/event.h>
 
 #define IS_TRACEPOINT_EVENT_RULE(rule) \
 	(lttng_event_rule_get_type(rule) == LTTNG_EVENT_RULE_TYPE_TRACEPOINT)
@@ -369,7 +370,7 @@ lttng_event_rule_tracepoint_generate_filter_bytecode(
 	enum lttng_domain_type domain_type;
 	enum lttng_event_rule_status status;
 	const char *filter;
-	struct lttng_filter_bytecode *bytecode = NULL;
+	struct lttng_bytecode *bytecode = NULL;
 
 	assert(rule);
 
@@ -461,7 +462,7 @@ static const char *lttng_event_rule_tracepoint_get_internal_filter(
 	return tracepoint->internal_filter.filter;
 }
 
-static const struct lttng_filter_bytecode *
+static const struct lttng_bytecode *
 lttng_event_rule_tracepoint_get_internal_filter_bytecode(
 		const struct lttng_event_rule *rule)
 {
@@ -599,11 +600,47 @@ static unsigned long lttng_event_rule_tracepoint_hash(
 	return hash;
 }
 
+static struct lttng_event *lttng_event_rule_tracepoint_generate_lttng_event(
+		const struct lttng_event_rule *rule)
+{
+	int ret;
+	const struct lttng_event_rule_tracepoint *tracepoint;
+	struct lttng_event *local_event = NULL;
+	struct lttng_event *event = NULL;
+
+	tracepoint = container_of(
+			rule, const struct lttng_event_rule_tracepoint, parent);
+
+	local_event = zmalloc(sizeof(*local_event));
+	if (!local_event) {
+		goto error;
+	}
+
+	local_event->type = LTTNG_EVENT_TRACEPOINT;
+	ret = lttng_strncpy(local_event->name, tracepoint->pattern,
+			    sizeof(local_event->name));
+	if (ret) {
+		ERR("Truncation occurred when copying event rule pattern to `lttng_event` structure: pattern = '%s'",
+				tracepoint->pattern);
+		goto error;
+	}
+
+	local_event->loglevel_type = tracepoint->loglevel.type;
+	local_event->loglevel = tracepoint->loglevel.value;
+
+	event = local_event;
+	local_event = NULL;
+error:
+	free(local_event);
+	return event;
+}
+
 struct lttng_event_rule *lttng_event_rule_tracepoint_create(
 		enum lttng_domain_type domain_type)
 {
 	struct lttng_event_rule *rule = NULL;
 	struct lttng_event_rule_tracepoint *tp_rule;
+	enum lttng_event_rule_status status;
 
 	if (domain_type == LTTNG_DOMAIN_NONE) {
 		goto end;
@@ -629,12 +666,22 @@ struct lttng_event_rule *lttng_event_rule_tracepoint_create(
 	tp_rule->parent.generate_exclusions =
 			lttng_event_rule_tracepoint_generate_exclusions;
 	tp_rule->parent.hash = lttng_event_rule_tracepoint_hash;
+	tp_rule->parent.generate_lttng_event =
+			lttng_event_rule_tracepoint_generate_lttng_event;
 
 	tp_rule->domain = domain_type;
 	tp_rule->loglevel.type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	lttng_dynamic_pointer_array_init(&tp_rule->exclusions,
 			destroy_lttng_exclusions_element);
+
+	/* Default pattern is '*'. */
+	status = lttng_event_rule_tracepoint_set_pattern(rule, "*");
+	if (status != LTTNG_EVENT_RULE_STATUS_OK) {
+		lttng_event_rule_destroy(rule);
+		rule = NULL;
+	}
+
 end:
 	return rule;
 }