Generate capture bytecode on trigger reception

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ibf86096bd17be078cfc5e8bcd82347797389d448
Depends-on: lttng-ust: I5a800fc92e588c2a6a0e26282b0ad5f31c044479

diff --git a/src/common/trigger.c b/src/common/trigger.c
index 04b3e7f116bc7ba667c96b8570c1621e2a09930e..71162e79bad63154b070b323ef75560ae89a72aa 100644 (file)
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -7,10 +7,12 @@
 
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition-internal.h>
 
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition-internal.h>

+#include <lttng/condition/event-rule-internal.h>

 #include <lttng/condition/event-rule.h>
 #include <lttng/condition/event-rule-internal.h>
 #include <lttng/condition/buffer-usage.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/condition/event-rule.h>
 #include <lttng/condition/event-rule-internal.h>
 #include <lttng/condition/buffer-usage.h>
 #include <lttng/event-rule/event-rule-internal.h>

+#include <lttng/event-expr-internal.h>

 #include <lttng/action/action-internal.h>
 #include <common/credentials.h>
 #include <common/payload.h>
 #include <lttng/action/action-internal.h>
 #include <common/credentials.h>
 #include <common/payload.h>


@@ -955,12 +957,21 @@ enum lttng_error_code lttng_trigger_generate_bytecode(
                                        condition, &event_rule);
 
                assert(condition_status == LTTNG_CONDITION_STATUS_OK);
                                        condition, &event_rule);
 
                assert(condition_status == LTTNG_CONDITION_STATUS_OK);

+
+               /* Generate the filter bytecode. */

                ret = lttng_event_rule_generate_filter_bytecode(
                                event_rule, creds);
                if (ret != LTTNG_OK) {
                        goto end;
                }
 
                ret = lttng_event_rule_generate_filter_bytecode(
                                event_rule, creds);
                if (ret != LTTNG_OK) {
                        goto end;
                }
 

+               /* Generate the capture bytecode. */
+               ret = lttng_condition_event_rule_generate_capture_descriptor_bytecode(
+                               condition);
+               if (ret != LTTNG_OK) {
+                       goto end;
+               }
+

                ret = LTTNG_OK;
                break;
        }
                ret = LTTNG_OK;
                break;
        }