Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

 * Don't show scripts menu for 'perf top', fix from Feng Tang

 * Add framework for automated perf_event_attr tests, where tools with
   different command line options will be run from a 'perf test', via
   python glue, and the perf syscall will be intercepted to verify that
   the perf_event_attr fields set by the tool are those expected,
   from Jiri Olsa

 * Use normalized arch name for searching objdump path. This fixes cases
   where the system's objdump (e.g. x86_64) supports the architecture in
   the perf.data file (e.g. i686), but is not the same,
   fix from Namhyung Kim.

 * Postpone objdump check until annotation requested, from Namhyung Kim.

 * Add a 'link' method for hists, so that we can have the leader with
   buckets for all the entries in all the hists.  This new method
   is now used in the default 'diff' output, making the sum of the 'baseline'
   column be 100%, eliminating blind spots. Now we need to use this
   for 'diff' with > 2 perf.data files and for multi event 'report' and
   'annotate'.

 * libtraceevent fixes for compiler warnings trying to make perf it build
   on some distros, like fedora 14, 32-bit, some of the warnings really
   pointed to real bugs.

 * Remove temp dir on failure in 'perf test', fix from Jiri Olsa.

 * Fixes for handling data, stack mmaps, from Namhyung Kim.

 * Fix live annotation bug related to recent objdump lookup patches, from
   Namhyung Kim

 * Don't try to follow jump target on PLT symbols in the annotation browser,
   fix from Namhyung Kim.

 * Fix leak on hist_entry delete, from Namhyung Kim.

 * Fix a CPU_ALLOC related build error on builtin-test, from Zheng Liu.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 154 insertions, 0 deletions

diff --git a/tools/perf/tests/dso-data.c b/tools/perf/tests/dso-data.c
new file mode 100644
index 000000000000..0cd42fc9bc13
--- /dev/null
+++ b/tools/perf/tests/dso-data.c
@@ -0,0 +1,154 @@
+#include "util.h"
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+
+#include "machine.h"
+#include "symbol.h"
+
+#define TEST_ASSERT_VAL(text, cond) \
+do { \
+        if (!(cond)) { \
+                pr_debug("FAILED %s:%d %s\n", __FILE__, __LINE__, text); \
+                return -1; \
+        } \
+} while (0)
+
+static char *test_file(int size)
+{
+        static char buf_templ[] = "/tmp/test-XXXXXX";
+        char *templ = buf_templ;
+        int fd, i;
+        unsigned char *buf;
+
+        fd = mkstemp(templ);
+
+        buf = malloc(size);
+        if (!buf) {
+                close(fd);
+                return NULL;
+        }
+
+        for (i = 0; i < size; i++)
+                buf[i] = (unsigned char) ((int) i % 10);
+
+        if (size != write(fd, buf, size))
+                templ = NULL;
+
+        close(fd);
+        return templ;
+}
+
+#define TEST_FILE_SIZE (DSO__DATA_CACHE_SIZE * 20)
+
+struct test_data_offset {
+        off_t offset;
+        u8 data[10];
+        int size;
+};
+
+struct test_data_offset offsets[] = {
+        /* Fill first cache page. */
+        {
+                .offset = 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Read first cache page. */
+        {
+                .offset = 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Fill cache boundary pages. */
+        {
+                .offset = DSO__DATA_CACHE_SIZE - DSO__DATA_CACHE_SIZE % 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Read cache boundary pages. */
+        {
+                .offset = DSO__DATA_CACHE_SIZE - DSO__DATA_CACHE_SIZE % 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Fill final cache page. */
+        {
+                .offset = TEST_FILE_SIZE - 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Read final cache page. */
+        {
+                .offset = TEST_FILE_SIZE - 10,
+                .data   = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 },
+                .size   = 10,
+        },
+        /* Read final cache page. */
+        {
+                .offset = TEST_FILE_SIZE - 3,
+                .data   = { 7, 8, 9, 0, 0, 0, 0, 0, 0, 0 },
+                .size   = 3,
+        },
+};
+
+int dso__test_data(void)
+{
+        struct machine machine;
+        struct dso *dso;
+        char *file = test_file(TEST_FILE_SIZE);
+        size_t i;
+
+        TEST_ASSERT_VAL("No test file", file);
+
+        memset(&machine, 0, sizeof(machine));
+
+        dso = dso__new((const char *)file);
+
+        /* Basic 10 bytes tests. */
+        for (i = 0; i < ARRAY_SIZE(offsets); i++) {
+                struct test_data_offset *data = &offsets[i];
+                ssize_t size;
+                u8 buf[10];
+
+                memset(buf, 0, 10);
+                size = dso__data_read_offset(dso, &machine, data->offset,
+                                     buf, 10);
+
+                TEST_ASSERT_VAL("Wrong size", size == data->size);
+                TEST_ASSERT_VAL("Wrong data", !memcmp(buf, data->data, 10));
+        }
+
+        /* Read cross multiple cache pages. */
+        {
+                ssize_t size;
+                int c;
+                u8 *buf;
+
+                buf = malloc(TEST_FILE_SIZE);
+                TEST_ASSERT_VAL("ENOMEM\n", buf);
+
+                /* First iteration to fill caches, second one to read them. */
+                for (c = 0; c < 2; c++) {
+                        memset(buf, 0, TEST_FILE_SIZE);
+                        size = dso__data_read_offset(dso, &machine, 10,
+                                                     buf, TEST_FILE_SIZE);
+
+                        TEST_ASSERT_VAL("Wrong size",
+                                size == (TEST_FILE_SIZE - 10));
+
+                        for (i = 0; i < (size_t)size; i++)
+                                TEST_ASSERT_VAL("Wrong data",
+                                        buf[i] == (i % 10));
+                }
+
+                free(buf);
+        }
+
+        dso__delete(dso);
+        unlink(file);
+        return 0;
+}