SoW-2020-0002: Trace Hit Counters: trigger error reporting integration

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

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 4432fca2340d2db3116eef9c60020f8de88c252d..527b354f1a5e5c287e17733202d57670e78ce687 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -194,7 +194,7 @@ error:
  * MUST be acquired before calling this.
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-               char *name, struct lttng_filter_bytecode *filter,
+               char *name, struct lttng_bytecode *filter,
                enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
                struct lttng_event_exclusion *exclusion)
 {
@@ -446,7 +446,7 @@ end:
  */
 enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
                char *filter_expression,
-               struct lttng_filter_bytecode *filter,
+               struct lttng_bytecode *filter,
                struct lttng_event_exclusion *exclusion,
                bool internal_event,
                struct ltt_ust_event **ust_event)
@@ -585,6 +585,9 @@ int trace_ust_context_type_event_to_ust(
        case LTTNG_EVENT_CONTEXT_PID_NS:
                utype = LTTNG_UST_CONTEXT_PID_NS;
                break;
+       case LTTNG_EVENT_CONTEXT_TIME_NS:
+               utype = LTTNG_UST_CONTEXT_TIME_NS;
+               break;
        case LTTNG_EVENT_CONTEXT_USER_NS:
                utype = LTTNG_UST_CONTEXT_USER_NS;
                break;
@@ -1033,6 +1036,7 @@ enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value(
        tracker = _trace_ust_get_process_attr_tracker(session, process_attr);
        if (!tracker) {
                ret_code = LTTNG_ERR_INVALID;
+               goto end;
        }
 
        status = process_attr_tracker_inclusion_set_add_value(tracker, value);
@@ -1141,6 +1145,7 @@ enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value(
        tracker = _trace_ust_get_process_attr_tracker(session, process_attr);
        if (!tracker) {
                ret_code = LTTNG_ERR_INVALID;
+               goto end;
        }
 
        status = process_attr_tracker_inclusion_set_remove_value(