Rename files for condition event-rule to on-event

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 8d36e7192c8deb32a46ca471c5d58dafd5e19d63..d3fc274c311a8ebb8bb0c70471f3cd98bfa5f6bd 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -30,8 +30,8 @@
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/on-event.h>
+#include <lttng/condition/on-event-internal.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/action/action.h>
@@ -115,7 +115,7 @@ static int cmd_enable_event_internal(struct ltt_session *session,
                const struct lttng_domain *domain,
                char *channel_name, struct lttng_event *event,
                char *filter_expression,
-               struct lttng_filter_bytecode *filter,
+               struct lttng_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
                int wpipe);
 
@@ -359,7 +359,7 @@ static ssize_t list_lttng_channels(enum lttng_domain_type domain,
                         * Map enum lttng_ust_output to enum lttng_event_output.
                         */
                        switch (uchan->attr.output) {
-                       case LTTNG_UST_MMAP:
+                       case LTTNG_UST_ABI_MMAP:
                                channels[i].attr.output = LTTNG_EVENT_MMAP;
                                break;
                        default:
@@ -579,26 +579,26 @@ static int list_lttng_ust_global_events(char *channel_name,
                event.enabled = uevent->enabled;
 
                switch (uevent->attr.instrumentation) {
-               case LTTNG_UST_TRACEPOINT:
+               case LTTNG_UST_ABI_TRACEPOINT:
                        event.type = LTTNG_EVENT_TRACEPOINT;
                        break;
-               case LTTNG_UST_PROBE:
+               case LTTNG_UST_ABI_PROBE:
                        event.type = LTTNG_EVENT_PROBE;
                        break;
-               case LTTNG_UST_FUNCTION:
+               case LTTNG_UST_ABI_FUNCTION:
                        event.type = LTTNG_EVENT_FUNCTION;
                        break;
                }
 
                event.loglevel = uevent->attr.loglevel;
                switch (uevent->attr.loglevel_type) {
-               case LTTNG_UST_LOGLEVEL_ALL:
+               case LTTNG_UST_ABI_LOGLEVEL_ALL:
                        event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
                        break;
-               case LTTNG_UST_LOGLEVEL_RANGE:
+               case LTTNG_UST_ABI_LOGLEVEL_RANGE:
                        event.loglevel_type = LTTNG_EVENT_LOGLEVEL_RANGE;
                        break;
-               case LTTNG_UST_LOGLEVEL_SINGLE:
+               case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
                        event.loglevel_type = LTTNG_EVENT_LOGLEVEL_SINGLE;
                        break;
                }
@@ -2083,7 +2083,7 @@ static int _cmd_enable_event(struct ltt_session *session,
                const struct lttng_domain *domain,
                char *channel_name, struct lttng_event *event,
                char *filter_expression,
-               struct lttng_filter_bytecode *filter,
+               struct lttng_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
                int wpipe, bool internal_event)
 {
@@ -2166,7 +2166,7 @@ static int _cmd_enable_event(struct ltt_session *session,
                case LTTNG_EVENT_ALL:
                {
                        char *filter_expression_a = NULL;
-                       struct lttng_filter_bytecode *filter_a = NULL;
+                       struct lttng_bytecode *filter_a = NULL;
 
                        /*
                         * We need to duplicate filter_expression and filter,
@@ -2401,11 +2401,11 @@ static int _cmd_enable_event(struct ltt_session *session,
 
                {
                        char *filter_expression_copy = NULL;
-                       struct lttng_filter_bytecode *filter_copy = NULL;
+                       struct lttng_bytecode *filter_copy = NULL;
 
                        if (filter) {
                                const size_t filter_size = sizeof(
-                                               struct lttng_filter_bytecode)
+                                               struct lttng_bytecode)
                                                + filter->len;
 
                                filter_copy = zmalloc(filter_size);
@@ -2481,7 +2481,7 @@ int cmd_enable_event(struct ltt_session *session,
                const struct lttng_domain *domain,
                char *channel_name, struct lttng_event *event,
                char *filter_expression,
-               struct lttng_filter_bytecode *filter,
+               struct lttng_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
                int wpipe)
 {
@@ -2498,7 +2498,7 @@ static int cmd_enable_event_internal(struct ltt_session *session,
                const struct lttng_domain *domain,
                char *channel_name, struct lttng_event *event,
                char *filter_expression,
-               struct lttng_filter_bytecode *filter,
+               struct lttng_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
                int wpipe)
 {
@@ -4203,7 +4203,7 @@ end:
  * then regenerate the metadata. Live and per-pid sessions are not
  * supported and return an error.
  *
- * Return 0 on success or else a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else a LTTNG_ERR code.
  */
 int cmd_regenerate_metadata(struct ltt_session *session)
 {
@@ -4244,7 +4244,7 @@ end:
  *
  * Ask the tracer to regenerate a new statedump.
  *
- * Return 0 on success or else a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else a LTTNG_ERR code.
  */
 int cmd_regenerate_statedump(struct ltt_session *session)
 {
@@ -4306,7 +4306,7 @@ static enum lttng_error_code trigger_modifies_event_notifier(
        }
 
        *adds_event_notifier = lttng_condition_get_type(condition) ==
-                       LTTNG_CONDITION_TYPE_EVENT_RULE_HIT;
+                       LTTNG_CONDITION_TYPE_ON_EVENT;
 end:
        return ret_code;
 }
@@ -5124,7 +5124,7 @@ int cmd_set_session_shm_path(struct ltt_session *session,
                sizeof(session->shm_path));
        session->shm_path[sizeof(session->shm_path) - 1] = '\0';
 
-       return 0;
+       return LTTNG_OK;
 }
 
 /*
@@ -5477,7 +5477,7 @@ end:
  * 'activate' to false means deactivate the rotation schedule and validate that
  * 'new_value' has the same value as the currently active value.
  *
- * Return 0 on success or else a positive LTTNG_ERR code.
+ * Return LTTNG_OK on success or else a positive LTTNG_ERR code.
  */
 int cmd_rotation_set_schedule(struct ltt_session *session,
                bool activate, enum lttng_rotation_schedule_type schedule_type,