sessiond: add support for anonymous triggers

[lttng-tools.git] / src / bin / lttng-sessiond / event-notifier-error-accounting.c

diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.c b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
index 9bc433312ad5209ceacc8c21de73637ada425322..aac6854679f2cc49dbfbc8dd4b9c10877ed5a235 100644 (file)
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.c
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.c
@@ -78,7 +78,7 @@ static inline void get_trigger_info_for_log(const struct lttng_trigger *trigger,
        case LTTNG_TRIGGER_STATUS_OK:
                break;
        case LTTNG_TRIGGER_STATUS_UNSET:
-               *trigger_name = "(unset)";
+               *trigger_name = "(anonymous)";
                break;
        default:
                abort();
@@ -491,6 +491,10 @@ event_notifier_error_accounting_register_app(struct ust_app *app)
 
        status = send_counter_data_to_ust(app, new_counter);
        if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+               if (status == EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_APP_DEAD) {
+                       goto error_send_counter_data;
+               }
+
                ERR("Failed to send counter data to application tracer: status = %s, application uid = %d, pid = %d, application name = '%s'",
                                error_accounting_status_str(status),
                                (int) app->uid, (int) app->pid, app->name);
@@ -525,6 +529,10 @@ event_notifier_error_accounting_register_app(struct ust_app *app)
                status = send_counter_cpu_data_to_ust(app, new_counter,
                                new_counter_cpu);
                if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+                       if (status == EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_APP_DEAD) {
+                               goto error_send_cpu_counter_data;
+                       }
+
                        ERR("Failed to send counter cpu data to application tracer: status = %s, application uid = %d, pid = %d, application name = '%s'",
                                        error_accounting_status_str(status),
                                        (int) app->uid, (int) app->pid,
@@ -1034,6 +1042,7 @@ event_notifier_error_accounting_get_count(
                return event_notifier_error_accounting_ust_get_count(trigger,
                                count);
 #else
+               *count = 0;
                return EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;
 #endif /* HAVE_LIBLTTNG_UST_CTL */
        default: