diff options
Diffstat (limited to 'tools/perf/util/header.c')
-rw-r--r-- | tools/perf/util/header.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index db280d6ca898..9272f3a20cac 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
@@ -2070,7 +2070,7 @@ out_delete_evlist: | |||
2070 | return -ENOMEM; | 2070 | return -ENOMEM; |
2071 | } | 2071 | } |
2072 | 2072 | ||
2073 | int perf_event__synthesize_attr(struct perf_event_ops *ops, | 2073 | int perf_event__synthesize_attr(struct perf_tool *tool, |
2074 | struct perf_event_attr *attr, u16 ids, u64 *id, | 2074 | struct perf_event_attr *attr, u16 ids, u64 *id, |
2075 | perf_event__handler_t process) | 2075 | perf_event__handler_t process) |
2076 | { | 2076 | { |
@@ -2094,14 +2094,14 @@ int perf_event__synthesize_attr(struct perf_event_ops *ops, | |||
2094 | ev->attr.header.type = PERF_RECORD_HEADER_ATTR; | 2094 | ev->attr.header.type = PERF_RECORD_HEADER_ATTR; |
2095 | ev->attr.header.size = size; | 2095 | ev->attr.header.size = size; |
2096 | 2096 | ||
2097 | err = process(ops, ev, NULL, NULL); | 2097 | err = process(tool, ev, NULL, NULL); |
2098 | 2098 | ||
2099 | free(ev); | 2099 | free(ev); |
2100 | 2100 | ||
2101 | return err; | 2101 | return err; |
2102 | } | 2102 | } |
2103 | 2103 | ||
2104 | int perf_event__synthesize_attrs(struct perf_event_ops *ops, | 2104 | int perf_event__synthesize_attrs(struct perf_tool *tool, |
2105 | struct perf_session *session, | 2105 | struct perf_session *session, |
2106 | perf_event__handler_t process) | 2106 | perf_event__handler_t process) |
2107 | { | 2107 | { |
@@ -2109,7 +2109,7 @@ int perf_event__synthesize_attrs(struct perf_event_ops *ops, | |||
2109 | int err = 0; | 2109 | int err = 0; |
2110 | 2110 | ||
2111 | list_for_each_entry(attr, &session->evlist->entries, node) { | 2111 | list_for_each_entry(attr, &session->evlist->entries, node) { |
2112 | err = perf_event__synthesize_attr(ops, &attr->attr, attr->ids, | 2112 | err = perf_event__synthesize_attr(tool, &attr->attr, attr->ids, |
2113 | attr->id, process); | 2113 | attr->id, process); |
2114 | if (err) { | 2114 | if (err) { |
2115 | pr_debug("failed to create perf header attribute\n"); | 2115 | pr_debug("failed to create perf header attribute\n"); |
@@ -2157,7 +2157,7 @@ int perf_event__process_attr(union perf_event *event, | |||
2157 | return 0; | 2157 | return 0; |
2158 | } | 2158 | } |
2159 | 2159 | ||
2160 | int perf_event__synthesize_event_type(struct perf_event_ops *ops, | 2160 | int perf_event__synthesize_event_type(struct perf_tool *tool, |
2161 | u64 event_id, char *name, | 2161 | u64 event_id, char *name, |
2162 | perf_event__handler_t process, | 2162 | perf_event__handler_t process, |
2163 | struct machine *machine) | 2163 | struct machine *machine) |
@@ -2178,12 +2178,12 @@ int perf_event__synthesize_event_type(struct perf_event_ops *ops, | |||
2178 | ev.event_type.header.size = sizeof(ev.event_type) - | 2178 | ev.event_type.header.size = sizeof(ev.event_type) - |
2179 | (sizeof(ev.event_type.event_type.name) - size); | 2179 | (sizeof(ev.event_type.event_type.name) - size); |
2180 | 2180 | ||
2181 | err = process(ops, &ev, NULL, machine); | 2181 | err = process(tool, &ev, NULL, machine); |
2182 | 2182 | ||
2183 | return err; | 2183 | return err; |
2184 | } | 2184 | } |
2185 | 2185 | ||
2186 | int perf_event__synthesize_event_types(struct perf_event_ops *ops, | 2186 | int perf_event__synthesize_event_types(struct perf_tool *tool, |
2187 | perf_event__handler_t process, | 2187 | perf_event__handler_t process, |
2188 | struct machine *machine) | 2188 | struct machine *machine) |
2189 | { | 2189 | { |
@@ -2193,7 +2193,7 @@ int perf_event__synthesize_event_types(struct perf_event_ops *ops, | |||
2193 | for (i = 0; i < event_count; i++) { | 2193 | for (i = 0; i < event_count; i++) { |
2194 | type = &events[i]; | 2194 | type = &events[i]; |
2195 | 2195 | ||
2196 | err = perf_event__synthesize_event_type(ops, type->event_id, | 2196 | err = perf_event__synthesize_event_type(tool, type->event_id, |
2197 | type->name, process, | 2197 | type->name, process, |
2198 | machine); | 2198 | machine); |
2199 | if (err) { | 2199 | if (err) { |
@@ -2205,7 +2205,7 @@ int perf_event__synthesize_event_types(struct perf_event_ops *ops, | |||
2205 | return err; | 2205 | return err; |
2206 | } | 2206 | } |
2207 | 2207 | ||
2208 | int perf_event__process_event_type(struct perf_event_ops *ops __unused, | 2208 | int perf_event__process_event_type(struct perf_tool *tool __unused, |
2209 | union perf_event *event) | 2209 | union perf_event *event) |
2210 | { | 2210 | { |
2211 | if (perf_header__push_event(event->event_type.event_type.event_id, | 2211 | if (perf_header__push_event(event->event_type.event_type.event_id, |
@@ -2215,7 +2215,7 @@ int perf_event__process_event_type(struct perf_event_ops *ops __unused, | |||
2215 | return 0; | 2215 | return 0; |
2216 | } | 2216 | } |
2217 | 2217 | ||
2218 | int perf_event__synthesize_tracing_data(struct perf_event_ops *ops, int fd, | 2218 | int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd, |
2219 | struct perf_evlist *evlist, | 2219 | struct perf_evlist *evlist, |
2220 | perf_event__handler_t process) | 2220 | perf_event__handler_t process) |
2221 | { | 2221 | { |
@@ -2248,7 +2248,7 @@ int perf_event__synthesize_tracing_data(struct perf_event_ops *ops, int fd, | |||
2248 | ev.tracing_data.header.size = sizeof(ev.tracing_data); | 2248 | ev.tracing_data.header.size = sizeof(ev.tracing_data); |
2249 | ev.tracing_data.size = aligned_size; | 2249 | ev.tracing_data.size = aligned_size; |
2250 | 2250 | ||
2251 | process(ops, &ev, NULL, NULL); | 2251 | process(tool, &ev, NULL, NULL); |
2252 | 2252 | ||
2253 | /* | 2253 | /* |
2254 | * The put function will copy all the tracing data | 2254 | * The put function will copy all the tracing data |
@@ -2290,7 +2290,7 @@ int perf_event__process_tracing_data(union perf_event *event, | |||
2290 | return size_read + padding; | 2290 | return size_read + padding; |
2291 | } | 2291 | } |
2292 | 2292 | ||
2293 | int perf_event__synthesize_build_id(struct perf_event_ops *ops, | 2293 | int perf_event__synthesize_build_id(struct perf_tool *tool, |
2294 | struct dso *pos, u16 misc, | 2294 | struct dso *pos, u16 misc, |
2295 | perf_event__handler_t process, | 2295 | perf_event__handler_t process, |
2296 | struct machine *machine) | 2296 | struct machine *machine) |
@@ -2313,12 +2313,12 @@ int perf_event__synthesize_build_id(struct perf_event_ops *ops, | |||
2313 | ev.build_id.header.size = sizeof(ev.build_id) + len; | 2313 | ev.build_id.header.size = sizeof(ev.build_id) + len; |
2314 | memcpy(&ev.build_id.filename, pos->long_name, pos->long_name_len); | 2314 | memcpy(&ev.build_id.filename, pos->long_name, pos->long_name_len); |
2315 | 2315 | ||
2316 | err = process(ops, &ev, NULL, machine); | 2316 | err = process(tool, &ev, NULL, machine); |
2317 | 2317 | ||
2318 | return err; | 2318 | return err; |
2319 | } | 2319 | } |
2320 | 2320 | ||
2321 | int perf_event__process_build_id(struct perf_event_ops *ops __used, | 2321 | int perf_event__process_build_id(struct perf_tool *tool __used, |
2322 | union perf_event *event, | 2322 | union perf_event *event, |
2323 | struct perf_session *session) | 2323 | struct perf_session *session) |
2324 | { | 2324 | { |