condition: implement event rule based condition

[lttng-tools.git] / src / common / event-rule / event-rule.c

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index 8e9b003c8d39ab3ee1f0725ba518548029cc0f8e..fbcb7a018a0c0889b32725877e850f1d85a81549 100644 (file)
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -14,6 +14,7 @@
 #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/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>
 
 #include <lttng/event-rule/uprobe-internal.h>
 #include <stdbool.h>
 


@@ -31,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:
 
        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;
                break;

+       }

        case LTTNG_EVENT_RULE_TYPE_SYSCALL:
        case LTTNG_EVENT_RULE_TYPE_KPROBE:
        case LTTNG_EVENT_RULE_TYPE_KRETPROBE:
        case LTTNG_EVENT_RULE_TYPE_SYSCALL:
        case LTTNG_EVENT_RULE_TYPE_KPROBE:
        case LTTNG_EVENT_RULE_TYPE_KRETPROBE:


@@ -141,21 +145,30 @@ ssize_t lttng_event_rule_create_from_payload(
                struct lttng_event_rule **event_rule)
 {
        ssize_t ret, consumed = 0;
                struct lttng_event_rule **event_rule)
 {
        ssize_t ret, consumed = 0;

-       const struct lttng_event_rule_comm *event_rule_comm;

        event_rule_create_from_payload_cb create_from_payload = NULL;
        event_rule_create_from_payload_cb create_from_payload = NULL;

+       const struct lttng_event_rule_comm *event_rule_comm;
+       const struct lttng_payload_view event_rule_comm_view =
+                       lttng_payload_view_from_view(
+                                       view, 0, sizeof(*event_rule_comm));

 
        if (!view || !event_rule) {
                ret = -1;
                goto end;
        }
 
 
        if (!view || !event_rule) {
                ret = -1;
                goto end;
        }
 

-       DBG("Deserializing event_rule from payload.");
-       event_rule_comm = (const struct lttng_event_rule_comm *) view->buffer.data;
+       if (!lttng_payload_view_is_valid(&event_rule_comm_view)) {
+               ret = -1;
+               goto end;
+       }
+
+       DBG("Deserializing event_rule from payload");
+       event_rule_comm = (const struct lttng_event_rule_comm *) event_rule_comm_view.buffer.data;

        consumed += sizeof(*event_rule_comm);
 
        switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) {
        case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
        consumed += sizeof(*event_rule_comm);
 
        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;
                break;
        case LTTNG_EVENT_RULE_TYPE_KPROBE:
                create_from_payload = lttng_event_rule_kprobe_create_from_payload;