X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=cdf3e0dedbea19b357fcb68a8342a26cf27c44ef;hp=7070115867d3fd91fb30ef1283e46133d6bf5f9f;hb=6d420eff669a3de55be3ee348f88a4e244b78ecf;hpb=e6a39346997db7e1d40026b2cc10be5893723eb3

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 707011586..cdf3e0ded 100644
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,6 +14,8 @@
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/kprobe-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
+#include <lttng/event-rule/tracepoint-internal.h>
+#include <lttng/event-rule/uprobe-internal.h>
 #include <stdbool.h>
 
 enum lttng_event_rule_type lttng_event_rule_get_type(
@@ -30,9 +32,12 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
 
 	switch (lttng_event_rule_get_type(event_rule)) {
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		/* TODO */
-		domain_type = LTTNG_DOMAIN_NONE;
+	{
+		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_SYSCALL:
 	case LTTNG_EVENT_RULE_TYPE_KPROBE:
 	case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
@@ -154,7 +159,8 @@ ssize_t lttng_event_rule_create_from_payload(
 
 	switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
 	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		/* TODO */
+		create_from_payload =
+				lttng_event_rule_tracepoint_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_KPROBE:
 		create_from_payload = lttng_event_rule_kprobe_create_from_payload;
@@ -163,7 +169,7 @@ ssize_t lttng_event_rule_create_from_payload(
 		/* TODO */
 		break;
 	case LTTNG_EVENT_RULE_TYPE_UPROBE:
-		/* TODO */
+		create_from_payload = lttng_event_rule_uprobe_create_from_payload;
 		break;
 	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
 		create_from_payload =