X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=2a84a1328ca577e668e15dfccbce3768e8d70315;hb=6a751b953a43c566b74818ec6325db0978e16c66;hp=51d0b622039454f7f8575c282fc9fdb0b622aabe;hpb=6530ec7ddc396cb95c2d223d0319ad94d3144dc3;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 51d0b6220..2a84a1328 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -8,20 +8,20 @@
 
 #include <assert.h>
 #include <common/error.h>
-#include <common/macros.h>
-#include <common/payload.h>
-#include <common/payload-view.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
+#include <common/macros.h>
+#include <common/mi-lttng.h>
+#include <common/payload-view.h>
+#include <common/payload.h>
 #include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/event-rule/jul-logging-internal.h>
 #include <lttng/event-rule/kernel-kprobe-internal.h>
 #include <lttng/event-rule/kernel-syscall-internal.h>
-#include <lttng/event-rule/log4j-logging-internal.h>
-#include <lttng/event-rule/jul-logging-internal.h>
-#include <lttng/event-rule/python-logging-internal.h>
-#include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/kernel-tracepoint-internal.h>
 #include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/log4j-logging-internal.h>
+#include <lttng/event-rule/python-logging-internal.h>
 #include <lttng/event-rule/user-tracepoint-internal.h>
 #include <stdbool.h>
 
@@ -38,13 +38,6 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 	enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
 
 	switch (lttng_event_rule_get_type(event_rule)) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-	{
-		enum lttng_event_rule_status status;
-		status = lttng_event_rule_tracepoint_get_domain_type(event_rule, &domain_type);
-		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
-		break;
-	}
 	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
 		domain_type = LTTNG_DOMAIN_UST;
 		break;
@@ -59,7 +52,6 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
 		domain_type = LTTNG_DOMAIN_KERNEL;
@@ -186,16 +178,9 @@ ssize_t lttng_event_rule_create_from_payload(
 	consumed += sizeof(*event_rule_comm);
 
 	switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		create_from_payload =
-				lttng_event_rule_tracepoint_create_from_payload;
-		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 		create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload;
 		break;
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		/* TODO */
-		break;
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload;
 		break;
@@ -349,14 +334,10 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 	switch (type) {
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
 		return "unknown";
-	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		return "tracepoint";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
 		return "kernel syscall";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
 		return "kernel kprobe";
-	case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-		return "function";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		return "kernel uprobe";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
@@ -381,3 +362,41 @@ unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule)
 	assert(rule->hash);
 	return rule->hash(rule);
 }
+
+LTTNG_HIDDEN
+enum lttng_error_code lttng_event_rule_mi_serialize(
+		const struct lttng_event_rule *rule, struct mi_writer *writer)
+{
+	int ret;
+	enum lttng_error_code ret_code;
+
+	assert(rule);
+	assert(writer);
+	assert(rule->mi_serialize);
+
+	/* Open event rule element. */
+	ret = mi_lttng_writer_open_element(writer, mi_lttng_element_event_rule);
+	if (ret) {
+		goto mi_error;
+	}
+
+	/* Serialize underlying event rule. */
+	ret_code = rule->mi_serialize(rule, writer);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* Close event rule element. */
+	ret = mi_lttng_writer_close_element(writer);
+	if (ret) {
+		goto mi_error;
+	}
+
+	ret_code = LTTNG_OK;
+	goto end;
+
+mi_error:
+	ret_code = LTTNG_ERR_MI_IO_FAIL;
+end:
+	return ret_code;
+}