X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrigger-error-query.c;h=4c464004d52f49fffcc1769fc8a338926ff0ed62;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=bc8e7f688b6e4b3071617047ca3e314b6d34a19d;hpb=588c4b0d153e8919b8d9159b69ce0db8fbe52af0;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 bc8e7f688..4c464004d 100644 --- a/src/bin/lttng-sessiond/trigger-error-query.c +++ b/src/bin/lttng-sessiond/trigger-error-query.c @@ -24,11 +24,17 @@ enum lttng_trigger_status lttng_trigger_add_error_results( status = lttng_trigger_get_name(trigger, &trigger_name); trigger_name = status == LTTNG_TRIGGER_STATUS_OK ? - trigger_name : "(unnamed)"; + trigger_name : "(anonymous)"; status = lttng_trigger_get_owner_uid(trigger, &trigger_owner); assert(status == LTTNG_TRIGGER_STATUS_OK); + /* Only add discarded tracer messages count for applicable triggers. */ + if (!lttng_trigger_needs_tracer_notifier(trigger)) { + status = LTTNG_TRIGGER_STATUS_OK; + goto end; + } + error_accounting_status = event_notifier_error_accounting_get_count( trigger, &discarded_tracer_messages_count); if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) { @@ -74,7 +80,7 @@ enum lttng_trigger_status lttng_trigger_add_action_error_query_results( status = lttng_trigger_get_name(trigger, &trigger_name); trigger_name = status == LTTNG_TRIGGER_STATUS_OK ? - trigger_name : "(unnamed)"; + trigger_name : "(anonymous)"; status = lttng_trigger_get_owner_uid(trigger, &trigger_owner); assert(status == LTTNG_TRIGGER_STATUS_OK); @@ -83,8 +89,7 @@ enum lttng_trigger_status lttng_trigger_add_action_error_query_results( lttng_trigger_get_action(trigger), results); switch (action_status) { case LTTNG_ACTION_STATUS_OK: - status = LTTNG_TRIGGER_STATUS_OK; - goto end; + break; default: status = LTTNG_TRIGGER_STATUS_ERROR; goto end;