X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrigger-error-query.c;h=1826a2d8b785197eb0b42b49c8b52aefce43b1c9;hb=4aef56636dd6e985ade1458597be2993df6e848f;hp=4c464004d52f49fffcc1769fc8a338926ff0ed62;hpb=0efb2ad7fc448283184e43d6fb0915febae45384;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/trigger-error-query.c b/src/bin/lttng-sessiond/trigger-error-query.c index 4c464004d..1826a2d8b 100644 --- a/src/bin/lttng-sessiond/trigger-error-query.c +++ b/src/bin/lttng-sessiond/trigger-error-query.c @@ -14,6 +14,14 @@ LTTNG_HIDDEN enum lttng_trigger_status lttng_trigger_add_error_results( const struct lttng_trigger *trigger, struct lttng_error_query_results *results) +{ + return LTTNG_TRIGGER_STATUS_OK; +} + +LTTNG_HIDDEN +enum lttng_trigger_status lttng_trigger_condition_add_error_results( + const struct lttng_trigger *trigger, + struct lttng_error_query_results *results) { enum lttng_trigger_status status; uint64_t discarded_tracer_messages_count; @@ -29,7 +37,12 @@ enum lttng_trigger_status lttng_trigger_add_error_results( &trigger_owner); assert(status == LTTNG_TRIGGER_STATUS_OK); - /* Only add discarded tracer messages count for applicable triggers. */ + /* + * Only add discarded tracer messages count for applicable conditions. + * As of 2.13, only "event rule matches" conditions can generate + * reportable errors hence why this function is very specific to this + * condition type. + */ if (!lttng_trigger_needs_tracer_notifier(trigger)) { status = LTTNG_TRIGGER_STATUS_OK; goto end; @@ -38,7 +51,7 @@ enum lttng_trigger_status lttng_trigger_add_error_results( error_accounting_status = event_notifier_error_accounting_get_count( trigger, &discarded_tracer_messages_count); if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) { - ERR("Failed to retrieve tracer discarded messages count for triger: triggger name = '%s', trigger owner uid = %d", + ERR("Failed to retrieve tracer discarded messages count for trigger: trigger name = '%s', trigger owner uid = %d", trigger_name, (int) trigger_owner); status = LTTNG_TRIGGER_STATUS_ERROR; goto end;