diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-11-15 13:17:39 +0200 |
| commit | e205ceeb253723f4e4bdce619844ed678ae48276 (patch) | |
| tree | b6f5e3b21f915320a86733504faf8206569b8057 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | 1cdc2330e8d396c9cbebfc75fba4c94d34f80782 (diff) | |
| parent | 17cc51390c141662748dbbc2fe98f3ed10f2e13e (diff) | |
| download | lwn-e205ceeb253723f4e4bdce619844ed678ae48276.tar.gz lwn-e205ceeb253723f4e4bdce619844ed678ae48276.zip | |
Merge drm/drm-next into drm-intel-next-queued
Backmerge to get dfce90259d74 ("Backmerge i915 security patches from
commit 'ea0b163b13ff' into drm-next") and thus 100d46bd72ec ("Merge
Intel Gen8/Gen9 graphics fixes from Jon Bloomfield.").
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 5d341efc3237..93c03b39cd9c 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -1687,10 +1687,11 @@ static int python_stop_script(void) static int python_generate_script(struct tep_handle *pevent, const char *outfile) { + int i, not_first, count, nr_events; + struct tep_event **all_events; struct tep_event *event = NULL; struct tep_format_field *f; char fname[PATH_MAX]; - int not_first, count; FILE *ofp; sprintf(fname, "%s.py", outfile); @@ -1735,7 +1736,11 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile fprintf(ofp, "def trace_end():\n"); fprintf(ofp, "\tprint(\"in trace_end\")\n\n"); - while ((event = trace_find_next_event(pevent, event))) { + nr_events = tep_get_events_count(pevent); + all_events = tep_list_events(pevent, TEP_EVENT_SORT_ID); + + for (i = 0; all_events && i < nr_events; i++) { + event = all_events[i]; fprintf(ofp, "def %s__%s(", event->system, event->name); fprintf(ofp, "event_name, "); fprintf(ofp, "context, "); |