Move firing policy from lttng_trigger to lttng_action

[lttng-tools.git] / src / common / trigger.c

diff --git a/src/common/trigger.c b/src/common/trigger.c
index b79b9e0448c6e624e6e819dc3a1b9fe254dc8382..125c871eaf80c98d63579713866d88339de4f760 100644 (file)
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -62,9 +62,6 @@ struct lttng_trigger *lttng_trigger_create(
 
        urcu_ref_init(&trigger->ref);
 
-       trigger->firing_policy.type = LTTNG_TRIGGER_FIRING_POLICY_EVERY_N;
-       trigger->firing_policy.threshold = 1;
-
        lttng_condition_get(condition);
        trigger->condition = condition;
 
@@ -133,23 +130,6 @@ void lttng_trigger_destroy(struct lttng_trigger *trigger)
        lttng_trigger_put(trigger);
 }
 
-static bool is_firing_policy_valid(enum lttng_trigger_firing_policy policy)
-{
-       bool valid = false;
-
-       switch (policy) {
-       case LTTNG_TRIGGER_FIRING_POLICY_EVERY_N:
-       case LTTNG_TRIGGER_FIRING_POLICY_ONCE_AFTER_N:
-               valid = true;
-               break;
-       default:
-               valid = false;
-               break;
-       }
-
-       return valid;
-}
-
 LTTNG_HIDDEN
 ssize_t lttng_trigger_create_from_payload(
                struct lttng_payload_view *src_view,
@@ -160,8 +140,6 @@ ssize_t lttng_trigger_create_from_payload(
        struct lttng_action *action = NULL;
        const struct lttng_trigger_comm *trigger_comm;
        const char *name = NULL;
-       uint64_t firing_policy_threshold;
-       enum lttng_trigger_firing_policy firing_policy;
        struct lttng_credentials creds = {
                .uid = LTTNG_OPTIONAL_INIT_UNSET,
                .gid = LTTNG_OPTIONAL_INIT_UNSET,
@@ -196,13 +174,6 @@ ssize_t lttng_trigger_create_from_payload(
 
        offset += sizeof(*trigger_comm);
 
-       firing_policy = trigger_comm->firing_policy_type;
-       if (!is_firing_policy_valid(firing_policy)) {
-               ret =-1;
-               goto end;
-       }
-
-       firing_policy_threshold = trigger_comm->firing_policy_threshold;
        if (trigger_comm->name_length != 0) {
                /* Name. */
                const struct lttng_payload_view name_view =
@@ -291,19 +262,6 @@ ssize_t lttng_trigger_create_from_payload(
                }
        }
 
-       /* Set the policy. */
-       {
-               const enum lttng_trigger_status status =
-                               lttng_trigger_set_firing_policy(trigger,
-                                               firing_policy,
-                                               firing_policy_threshold);
-
-               if (status != LTTNG_TRIGGER_STATUS_OK) {
-                       ret = -1;
-                       goto end;
-               }
-       }
-
        ret = offset;
 
 error:
@@ -345,8 +303,6 @@ int lttng_trigger_serialize(const struct lttng_trigger *trigger,
        }
 
        trigger_comm.name_length = size_name;
-       trigger_comm.firing_policy_type = (uint8_t) trigger->firing_policy.type;
-       trigger_comm.firing_policy_threshold = (uint64_t) trigger->firing_policy.threshold;
 
        header_offset = payload->buffer.size;
        ret = lttng_dynamic_buffer_append(&payload->buffer, &trigger_comm,
@@ -385,14 +341,6 @@ LTTNG_HIDDEN
 bool lttng_trigger_is_equal(
                const struct lttng_trigger *a, const struct lttng_trigger *b)
 {
-       if (a->firing_policy.type != b->firing_policy.type) {
-               return false;
-       }
-
-       if (a->firing_policy.threshold != b->firing_policy.threshold) {
-               return false;
-       }
-
        if (strcmp(a->name, b->name) != 0) {
                return false;
        }
@@ -796,97 +744,6 @@ end:
        return ret;
 }
 
-enum lttng_trigger_status lttng_trigger_set_firing_policy(
-               struct lttng_trigger *trigger,
-               enum lttng_trigger_firing_policy policy_type,
-               uint64_t threshold)
-{
-       enum lttng_trigger_status ret = LTTNG_TRIGGER_STATUS_OK;
-       assert(trigger);
-
-       if (threshold < 1) {
-               ret = LTTNG_TRIGGER_STATUS_INVALID;
-               goto end;
-       }
-
-       trigger->firing_policy.type = policy_type;
-       trigger->firing_policy.threshold = threshold;
-
-end:
-       return ret;
-}
-
-enum lttng_trigger_status lttng_trigger_get_firing_policy(
-               const struct lttng_trigger *trigger,
-               enum lttng_trigger_firing_policy *policy_type,
-               uint64_t *threshold)
-{
-       enum lttng_trigger_status status = LTTNG_TRIGGER_STATUS_OK;
-
-       if (!trigger || !policy_type || !threshold) {
-               status = LTTNG_TRIGGER_STATUS_INVALID;
-               goto end;
-       }
-
-       *policy_type = trigger->firing_policy.type;
-       *threshold = trigger->firing_policy.threshold;
-
-end:
-       return status;
-}
-
-LTTNG_HIDDEN
-bool lttng_trigger_should_fire(const struct lttng_trigger *trigger)
-{
-       bool ready_to_fire = false;
-
-       assert(trigger);
-
-       switch (trigger->firing_policy.type) {
-       case LTTNG_TRIGGER_FIRING_POLICY_EVERY_N:
-               if (trigger->firing_policy.current_count < trigger->firing_policy.threshold) {
-                       ready_to_fire = true;
-               }
-               break;
-       case LTTNG_TRIGGER_FIRING_POLICY_ONCE_AFTER_N:
-               if (trigger->firing_policy.current_count < trigger->firing_policy.threshold) {
-                       ready_to_fire = true;
-               }
-               break;
-       default:
-               abort();
-       };
-
-       return ready_to_fire;
-}
-
-LTTNG_HIDDEN
-void lttng_trigger_fire(struct lttng_trigger *trigger)
-{
-       assert(trigger);
-
-       trigger->firing_policy.current_count++;
-
-       switch (trigger->firing_policy.type) {
-       case LTTNG_TRIGGER_FIRING_POLICY_EVERY_N:
-               if (trigger->firing_policy.current_count == trigger->firing_policy.threshold) {
-                       trigger->firing_policy.current_count = 0;
-               }
-
-               break;
-       case LTTNG_TRIGGER_FIRING_POLICY_ONCE_AFTER_N:
-               /*
-                * TODO:
-                * As an optimisation, deactivate the trigger condition and
-                * remove any checks in the traced application or kernel since
-                * the trigger will never fire again.
-                */
-               break;
-       default:
-               abort();
-       };
-}
-
 LTTNG_HIDDEN
 enum lttng_domain_type lttng_trigger_get_underlying_domain_type_restriction(
                const struct lttng_trigger *trigger)