projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: statements with side-effects in assert statements
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
trigger-error-query.c
diff --git
a/src/bin/lttng-sessiond/trigger-error-query.c
b/src/bin/lttng-sessiond/trigger-error-query.c
index 54aeb414959ae9d12cba8e47bf5ed955e4cb797a..1826a2d8b785197eb0b42b49c8b52aefce43b1c9 100644
(file)
--- 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)
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;
{
enum lttng_trigger_status status;
uint64_t discarded_tracer_messages_count;
@@
-24,12
+32,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 ?
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);
status = lttng_trigger_get_owner_uid(trigger,
&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;
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) {
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 trig
er: trig
gger name = '%s', trigger owner uid = %d",
+ ERR("Failed to retrieve tracer discarded messages count for trig
ger: tri
gger name = '%s', trigger owner uid = %d",
trigger_name, (int) trigger_owner);
status = LTTNG_TRIGGER_STATUS_ERROR;
goto end;
trigger_name, (int) trigger_owner);
status = LTTNG_TRIGGER_STATUS_ERROR;
goto end;
@@
-80,7
+93,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 ?
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);
status = lttng_trigger_get_owner_uid(trigger,
&trigger_owner);
assert(status == LTTNG_TRIGGER_STATUS_OK);
This page took
0.024357 seconds
and
4
git commands to generate.