perf evlist: Fix parsing with no sample_id_all bit set (98be6966) · Commits · 戴 / test

The perf_evlist__event2evsel() is changed to handle non-sample events (such as mmap events) that have no id sample appended i.e. when sample_id_all is not set. Note that such events have a fixed format, so that the selected event (evsel) they are associated with is immaterial. Signed-off-by:

Adrian Hunter <adrian.hunter@intel.com> Tested-by:

David Ahern <dsahern@gmail.com> Acked-by:

David Ahern <dsahern@gmail.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1378325897-3840-3-git-send-email-adrian.hunter@intel.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/evlist.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -446,20 +446,25 @@ static int perf_evlist__event2id(struct perf_evlist *evlist,
	static struct perf_evsel perf_evlist__event2evsel(struct perf_evlist evlist,		static struct perf_evsel perf_evlist__event2evsel(struct perf_evlist evlist,
	union perf_event *event)		union perf_event *event)
	{		{
			struct perf_evsel *first = perf_evlist__first(evlist);
	struct hlist_head *head;		struct hlist_head *head;
	struct perf_sample_id *sid;		struct perf_sample_id *sid;
	int hash;		int hash;
	u64 id;		u64 id;

	if (evlist->nr_entries == 1)		if (evlist->nr_entries == 1)
	return perf_evlist__first(evlist);		return first;

			if (!first->attr.sample_id_all &&
			event->header.type != PERF_RECORD_SAMPLE)
			return first;

	if (perf_evlist__event2id(evlist, event, &id))		if (perf_evlist__event2id(evlist, event, &id))
	return NULL;		return NULL;

	/* Synthesized events have an id of zero */		/* Synthesized events have an id of zero */
	if (!id)		if (!id)
	return perf_evlist__first(evlist);		return first;

	hash = hash_64(id, PERF_EVLIST__HLIST_BITS);		hash = hash_64(id, PERF_EVLIST__HLIST_BITS);
	head = &evlist->heads[hash];		head = &evlist->heads[hash];

Admin message