Re: [PATCH v2 19/40] tracing: Account for variables in named trigger compatibility

From: Steven Rostedt
Date: Thu Sep 07 2017 - 12:40:22 EST


On Tue, 5 Sep 2017 16:57:31 -0500
Tom Zanussi <tom.zanussi@xxxxxxxxxxxxxxx> wrote:

> @@ -1786,6 +1786,12 @@ static bool hist_trigger_match(struct event_trigger_data *data,
> return false;
> if (key_field->is_signed != key_field_test->is_signed)
> return false;
> + if ((key_field->var.name && !key_field_test->var.name) ||
> + (!key_field->var.name && key_field_test->var.name))
> + return false;

Short cut:

if (!!key_field->var.name != !!key_field_test->var.name)
return false;

> + if ((key_field->var.name && key_field_test->var.name) &&

Only need to test if key_field->var.name, as the previous if statement
would exit out if key_field_test->var.name is false.

-- Steve

> + strcmp(key_field->var.name, key_field_test->var.name) != 0)
> + return false;
> }
>
> for (i = 0; i < hist_data->n_sort_keys; i++) {