|
@@ -88,6 +88,7 @@ struct hist_trigger_attrs {
|
|
|
char *sort_key_str;
|
|
|
bool pause;
|
|
|
bool cont;
|
|
|
+ bool clear;
|
|
|
unsigned int map_bits;
|
|
|
};
|
|
|
|
|
@@ -200,6 +201,8 @@ static struct hist_trigger_attrs *parse_hist_trigger_attrs(char *trigger_str)
|
|
|
else if ((strcmp(str, "cont") == 0) ||
|
|
|
(strcmp(str, "continue") == 0))
|
|
|
attrs->cont = true;
|
|
|
+ else if (strcmp(str, "clear") == 0)
|
|
|
+ attrs->clear = true;
|
|
|
else if (strncmp(str, "size=", strlen("size=")) == 0) {
|
|
|
int map_bits = parse_map_size(str);
|
|
|
|
|
@@ -916,6 +919,21 @@ static struct event_trigger_ops *event_hist_get_trigger_ops(char *cmd,
|
|
|
return &event_hist_trigger_ops;
|
|
|
}
|
|
|
|
|
|
+static void hist_clear(struct event_trigger_data *data)
|
|
|
+{
|
|
|
+ struct hist_trigger_data *hist_data = data->private_data;
|
|
|
+ bool paused;
|
|
|
+
|
|
|
+ paused = data->paused;
|
|
|
+ data->paused = true;
|
|
|
+
|
|
|
+ synchronize_sched();
|
|
|
+
|
|
|
+ tracing_map_clear(hist_data->map);
|
|
|
+
|
|
|
+ data->paused = paused;
|
|
|
+}
|
|
|
+
|
|
|
static int hist_register_trigger(char *glob, struct event_trigger_ops *ops,
|
|
|
struct event_trigger_data *data,
|
|
|
struct trace_event_file *file)
|
|
@@ -930,13 +948,15 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops,
|
|
|
test->paused = true;
|
|
|
else if (hist_data->attrs->cont)
|
|
|
test->paused = false;
|
|
|
+ else if (hist_data->attrs->clear)
|
|
|
+ hist_clear(test);
|
|
|
else
|
|
|
ret = -EEXIST;
|
|
|
goto out;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (hist_data->attrs->cont) {
|
|
|
+ if (hist_data->attrs->cont || hist_data->attrs->clear) {
|
|
|
ret = -ENOENT;
|
|
|
goto out;
|
|
|
}
|
|
@@ -1035,7 +1055,7 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
|
|
|
* triggers registered a failure too.
|
|
|
*/
|
|
|
if (!ret) {
|
|
|
- if (!(attrs->pause || attrs->cont))
|
|
|
+ if (!(attrs->pause || attrs->cont || attrs->clear))
|
|
|
ret = -ENOENT;
|
|
|
goto out_free;
|
|
|
} else if (ret < 0)
|