Commit b559d003 authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt (VMware)

tracing: Add hist_data member to hist_field

Allow hist_data access via hist_field.  Some users of hist_fields
require or will require more access to the associated hist_data.

Link: http://lkml.kernel.org/r/d04cd0768f5228ebb4ac0ba4a847bc4d14d4826f.1516069914.git.tom.zanussi@linux.intel.comSigned-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 2734b629
...@@ -39,6 +39,7 @@ struct hist_field { ...@@ -39,6 +39,7 @@ struct hist_field {
unsigned int offset; unsigned int offset;
unsigned int is_signed; unsigned int is_signed;
struct hist_field *operands[HIST_FIELD_OPERANDS_MAX]; struct hist_field *operands[HIST_FIELD_OPERANDS_MAX];
struct hist_trigger_data *hist_data;
}; };
static u64 hist_field_none(struct hist_field *field, void *event, static u64 hist_field_none(struct hist_field *field, void *event,
...@@ -420,7 +421,8 @@ static void destroy_hist_field(struct hist_field *hist_field, ...@@ -420,7 +421,8 @@ static void destroy_hist_field(struct hist_field *hist_field,
kfree(hist_field); kfree(hist_field);
} }
static struct hist_field *create_hist_field(struct ftrace_event_field *field, static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
struct ftrace_event_field *field,
unsigned long flags) unsigned long flags)
{ {
struct hist_field *hist_field; struct hist_field *hist_field;
...@@ -432,6 +434,8 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field, ...@@ -432,6 +434,8 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field,
if (!hist_field) if (!hist_field)
return NULL; return NULL;
hist_field->hist_data = hist_data;
if (flags & HIST_FIELD_FL_HITCOUNT) { if (flags & HIST_FIELD_FL_HITCOUNT) {
hist_field->fn = hist_field_counter; hist_field->fn = hist_field_counter;
goto out; goto out;
...@@ -445,7 +449,7 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field, ...@@ -445,7 +449,7 @@ static struct hist_field *create_hist_field(struct ftrace_event_field *field,
if (flags & HIST_FIELD_FL_LOG2) { if (flags & HIST_FIELD_FL_LOG2) {
unsigned long fl = flags & ~HIST_FIELD_FL_LOG2; unsigned long fl = flags & ~HIST_FIELD_FL_LOG2;
hist_field->fn = hist_field_log2; hist_field->fn = hist_field_log2;
hist_field->operands[0] = create_hist_field(field, fl); hist_field->operands[0] = create_hist_field(hist_data, field, fl);
hist_field->size = hist_field->operands[0]->size; hist_field->size = hist_field->operands[0]->size;
goto out; goto out;
} }
...@@ -498,7 +502,7 @@ static void destroy_hist_fields(struct hist_trigger_data *hist_data) ...@@ -498,7 +502,7 @@ static void destroy_hist_fields(struct hist_trigger_data *hist_data)
static int create_hitcount_val(struct hist_trigger_data *hist_data) static int create_hitcount_val(struct hist_trigger_data *hist_data)
{ {
hist_data->fields[HITCOUNT_IDX] = hist_data->fields[HITCOUNT_IDX] =
create_hist_field(NULL, HIST_FIELD_FL_HITCOUNT); create_hist_field(hist_data, NULL, HIST_FIELD_FL_HITCOUNT);
if (!hist_data->fields[HITCOUNT_IDX]) if (!hist_data->fields[HITCOUNT_IDX])
return -ENOMEM; return -ENOMEM;
...@@ -544,7 +548,7 @@ static int create_val_field(struct hist_trigger_data *hist_data, ...@@ -544,7 +548,7 @@ static int create_val_field(struct hist_trigger_data *hist_data,
} }
} }
hist_data->fields[val_idx] = create_hist_field(field, flags); hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags);
if (!hist_data->fields[val_idx]) { if (!hist_data->fields[val_idx]) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -654,7 +658,7 @@ static int create_key_field(struct hist_trigger_data *hist_data, ...@@ -654,7 +658,7 @@ static int create_key_field(struct hist_trigger_data *hist_data,
} }
} }
hist_data->fields[key_idx] = create_hist_field(field, flags); hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags);
if (!hist_data->fields[key_idx]) { if (!hist_data->fields[key_idx]) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment