X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=a664ee0e851037e17add207c7b2191bc07983231;hb=cc66eccf4e5a71ce3c6cc5b0705c4a3dd3874168;hp=33e91cdfb02649add73e6fc64632bc660ffede09;hpb=d84633c4baef5c02b82c75bd25e859a2a7a96fe3;p=lttng-tools.git

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 33e91cdfb..a664ee0e8 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -17,7 +17,9 @@
 #include <lttng/event-rule/kernel-kprobe-internal.h>
 #include <lttng/event-rule/kernel-syscall-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/user-tracepoint-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -40,10 +42,14 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 		assert(status == LTTNG_EVENT_RULE_STATUS_OK);
 		break;
 	}
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		domain_type = LTTNG_DOMAIN_UST;
+		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;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UNKNOWN:
@@ -185,6 +191,14 @@ ssize_t lttng_event_rule_create_from_payload(
 		create_from_payload =
 				lttng_event_rule_kernel_syscall_create_from_payload;
 		break;
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+		create_from_payload =
+				lttng_event_rule_kernel_tracepoint_create_from_payload;
+		break;
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		create_from_payload =
+				lttng_event_rule_user_tracepoint_create_from_payload;
+		break;
 	default:
 		ERR("Attempted to create event rule of unknown type (%i)",
 				(int) event_rule_comm->event_rule_type);
@@ -321,6 +335,10 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 		return "function";
 	case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
 		return "kernel uprobe";
+	case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+		return "kernel tracepoint";
+	case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+		return "user tracepoint";
 	default:
 		abort();
 	}