← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to tools/perf/util/trace-event-parse.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/perf/util/trace-event-parse.c
120
120
        return val;
121
121
}
122
122
 
123
 
void *raw_field_ptr(struct event_format *event, const char *name, void *data)
124
 
{
125
 
        struct format_field *field;
126
 
 
127
 
        field = pevent_find_any_field(event, name);
128
 
        if (!field)
129
 
                return NULL;
130
 
 
131
 
        if (field->flags & FIELD_IS_DYNAMIC) {
132
 
                int offset;
133
 
 
134
 
                offset = *(int *)(data + field->offset);
135
 
                offset &= 0xffff;
136
 
 
137
 
                return data + offset;
138
 
        }
139
 
 
140
 
        return data + field->offset;
141
 
}
142
 
 
143
 
int trace_parse_common_type(struct pevent *pevent, void *data)
144
 
{
145
 
        struct pevent_record record;
146
 
 
147
 
        record.data = data;
148
 
        return pevent_data_type(pevent, &record);
149
 
}
150
 
 
151
 
int trace_parse_common_pid(struct pevent *pevent, void *data)
152
 
{
153
 
        struct pevent_record record;
154
 
 
155
 
        record.data = data;
156
 
        return pevent_data_pid(pevent, &record);
157
 
}
158
 
 
159
123
unsigned long long read_size(struct event_format *event, void *ptr, int size)
160
124
{
161
125
        return pevent_read_number(event->pevent, ptr, size);