Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / tools / perf / util / scripting-engines / trace-event-python.c

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index d7183134b669931fdae286791f4d5927f53148d2..8bdae066e83972a1de1615d676388af0d4b596a7 100644 (file)
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -31,7 +31,7 @@
 #include <linux/compiler.h>
 #include <linux/time64.h>
 #ifdef HAVE_LIBTRACEEVENT
 #include <linux/compiler.h>
 #include <linux/time64.h>
 #ifdef HAVE_LIBTRACEEVENT

-#include <traceevent/event-parse.h>
+#include <event-parse.h>

 #endif
 
 #include "../build-id.h"
 #endif
 
 #include "../build-id.h"


@@ -793,7 +793,8 @@ static int set_regs_in_dict(PyObject *dict,
 static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
                            const char *dso_field, const char *dso_bid_field,
                            const char *dso_map_start, const char *dso_map_end,
 static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
                            const char *dso_field, const char *dso_bid_field,
                            const char *dso_map_start, const char *dso_map_end,

-                           const char *sym_field, const char *symoff_field)
+                           const char *sym_field, const char *symoff_field,
+                           const char *map_pgoff)

 {
        char sbuild_id[SBUILD_ID_SIZE];
 
 {
        char sbuild_id[SBUILD_ID_SIZE];
 


@@ -809,6 +810,8 @@ static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
                        PyLong_FromUnsignedLong(map__start(al->map)));
                pydict_set_item_string_decref(dict, dso_map_end,
                        PyLong_FromUnsignedLong(map__end(al->map)));
                        PyLong_FromUnsignedLong(map__start(al->map)));
                pydict_set_item_string_decref(dict, dso_map_end,
                        PyLong_FromUnsignedLong(map__end(al->map)));

+               pydict_set_item_string_decref(dict, map_pgoff,
+                       PyLong_FromUnsignedLongLong(map__pgoff(al->map)));

        }
        if (al->sym) {
                pydict_set_item_string_decref(dict, sym_field,
        }
        if (al->sym) {
                pydict_set_item_string_decref(dict, sym_field,


@@ -895,7 +898,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
        pydict_set_item_string_decref(dict, "comm",
                        _PyUnicode_FromString(thread__comm_str(al->thread)));
        set_sym_in_dict(dict, al, "dso", "dso_bid", "dso_map_start", "dso_map_end",
        pydict_set_item_string_decref(dict, "comm",
                        _PyUnicode_FromString(thread__comm_str(al->thread)));
        set_sym_in_dict(dict, al, "dso", "dso_bid", "dso_map_start", "dso_map_end",

-                       "symbol", "symoff");
+                       "symbol", "symoff", "map_pgoff");

 
        pydict_set_item_string_decref(dict, "callchain", callchain);
 
 
        pydict_set_item_string_decref(dict, "callchain", callchain);
 


@@ -920,7 +923,7 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
                        PyBool_FromLong(1));
                set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_dso_bid",
                                "addr_dso_map_start", "addr_dso_map_end",
                        PyBool_FromLong(1));
                set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_dso_bid",
                                "addr_dso_map_start", "addr_dso_map_end",

-                               "addr_symbol", "addr_symoff");
+                               "addr_symbol", "addr_symoff", "addr_map_pgoff");

        }
 
        if (sample->flags)
        }
 
        if (sample->flags)