perf tools: Add test for parsing with no sample_id_all bit
Add a test for parsing a non-sample event when there is more than one selected event but no sample_id_all bit set. The test fails because of a bug in the evlist logic. That is fixed in a separate patch. Signed-off-by: Adrian Hunter <adrian.hunter@intel.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-2-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
20c5f10eb5
commit
53a277e5c9
|
@ -394,6 +394,8 @@ ifeq ($(ARCH),x86)
|
|||
LIB_OBJS += $(OUTPUT)tests/perf-time-to-tsc.o
|
||||
endif
|
||||
LIB_OBJS += $(OUTPUT)tests/code-reading.o
|
||||
LIB_OBJS += $(OUTPUT)tests/sample-parsing.o
|
||||
LIB_OBJS += $(OUTPUT)tests/parse-no-sample-id-all.o
|
||||
|
||||
BUILTIN_OBJS += $(OUTPUT)builtin-annotate.o
|
||||
BUILTIN_OBJS += $(OUTPUT)builtin-bench.o
|
||||
|
@ -439,7 +441,6 @@ PERFLIBS = $(LIB_FILE) $(LIBLK) $(LIBTRACEEVENT)
|
|||
ifneq ($(OUTPUT),)
|
||||
CFLAGS += -I$(OUTPUT)
|
||||
endif
|
||||
LIB_OBJS += $(OUTPUT)tests/sample-parsing.o
|
||||
|
||||
ifdef NO_LIBELF
|
||||
EXTLIBS := $(filter-out -lelf,$(EXTLIBS))
|
||||
|
|
|
@ -111,6 +111,10 @@ static struct test {
|
|||
.desc = "Test using a dummy software event to keep tracking",
|
||||
.func = test__keep_tracking,
|
||||
},
|
||||
{
|
||||
.desc = "Test parsing with no sample_id_all bit set",
|
||||
.func = test__parse_no_sample_id_all,
|
||||
},
|
||||
{
|
||||
.func = NULL,
|
||||
},
|
||||
|
|
|
@ -0,0 +1,108 @@
|
|||
#include <sys/types.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include "tests.h"
|
||||
|
||||
#include "event.h"
|
||||
#include "evlist.h"
|
||||
#include "header.h"
|
||||
#include "util.h"
|
||||
|
||||
static int process_event(struct perf_evlist **pevlist, union perf_event *event)
|
||||
{
|
||||
struct perf_sample sample;
|
||||
|
||||
if (event->header.type == PERF_RECORD_HEADER_ATTR) {
|
||||
if (perf_event__process_attr(NULL, event, pevlist)) {
|
||||
pr_debug("perf_event__process_attr failed\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (event->header.type >= PERF_RECORD_USER_TYPE_START)
|
||||
return -1;
|
||||
|
||||
if (!*pevlist)
|
||||
return -1;
|
||||
|
||||
if (perf_evlist__parse_sample(*pevlist, event, &sample)) {
|
||||
pr_debug("perf_evlist__parse_sample failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int process_events(union perf_event **events, size_t count)
|
||||
{
|
||||
struct perf_evlist *evlist = NULL;
|
||||
int err = 0;
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < count && !err; i++)
|
||||
err = process_event(&evlist, events[i]);
|
||||
|
||||
if (evlist)
|
||||
perf_evlist__delete(evlist);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
struct test_attr_event {
|
||||
struct attr_event attr;
|
||||
u64 id;
|
||||
};
|
||||
|
||||
/**
|
||||
* test__parse_no_sample_id_all - test parsing with no sample_id_all bit set.
|
||||
*
|
||||
* This function tests parsing data produced on kernel's that do not support the
|
||||
* sample_id_all bit. Without the sample_id_all bit, non-sample events (such as
|
||||
* mmap events) do not have an id sample appended, and consequently logic
|
||||
* designed to determine the id will not work. That case happens when there is
|
||||
* more than one selected event, so this test processes three events: 2
|
||||
* attributes representing the selected events and one mmap event.
|
||||
*
|
||||
* Return: %0 on success, %-1 if the test fails.
|
||||
*/
|
||||
int test__parse_no_sample_id_all(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
struct test_attr_event event1 = {
|
||||
.attr = {
|
||||
.header = {
|
||||
.type = PERF_RECORD_HEADER_ATTR,
|
||||
.size = sizeof(struct test_attr_event),
|
||||
},
|
||||
},
|
||||
.id = 1,
|
||||
};
|
||||
struct test_attr_event event2 = {
|
||||
.attr = {
|
||||
.header = {
|
||||
.type = PERF_RECORD_HEADER_ATTR,
|
||||
.size = sizeof(struct test_attr_event),
|
||||
},
|
||||
},
|
||||
.id = 2,
|
||||
};
|
||||
struct mmap_event event3 = {
|
||||
.header = {
|
||||
.type = PERF_RECORD_MMAP,
|
||||
.size = sizeof(struct mmap_event),
|
||||
},
|
||||
};
|
||||
union perf_event *events[] = {
|
||||
(union perf_event *)&event1,
|
||||
(union perf_event *)&event2,
|
||||
(union perf_event *)&event3,
|
||||
};
|
||||
|
||||
err = process_events(events, ARRAY_SIZE(events));
|
||||
if (err)
|
||||
return -1;
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -39,5 +39,6 @@ int test__perf_time_to_tsc(void);
|
|||
int test__code_reading(void);
|
||||
int test__sample_parsing(void);
|
||||
int test__keep_tracking(void);
|
||||
int test__parse_no_sample_id_all(void);
|
||||
|
||||
#endif /* TESTS_H */
|
||||
|
|
Loading…
Reference in New Issue