Merge tag 'perf-core-for-mingo-5.3-20190529' 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:

BPF:

  Jiri Olsa:

  - Preserve eBPF maps when loading kcore.

  - Fix up DSO name padding in 'perf script --call-trace', as BPF DSO names are
    much larger than what we used to have there.

  - Add --show-bpf-events to 'perf script'.

perf trace:

  Arnaldo Carvalho de Melo:

  - Add string table generators and beautify arguments for the new fspick,
    fsmount, fsconfig, fsopen, move_mount and open_tree syscalls, as well
    as new values for arguments of clone and sync_file_range syscalls.

perf version:

  Arnaldo Carvalho de Melo:

  - Append 12 git SHA chars to the version string.

Namespaces:

  Namhyung Kim:

  - Add missing --namespaces option to 'perf top', to generate and process
    namespace events, just like present for 'perf record'.

Intel PT:

  Andrian Hunter:

  - Fix itrace defaults for 'perf script', not using the 'use_browser' variable
    to figure out what options are better for 'script' and 'report'

  - Allow root fixing up buildid cache permissions in the perf-with-kcore.sh
    script when sharing that cache with another user.

  - Improve sync_switch, a facility used to synchronize decoding of HW
    traces more closely with the point in the kerne where a context
    switch took place, by processing the PERF_RECORD_CONTEXT_SWITCH "in"
    metadata records too.

  - Make the exported-sql-viewer.py GUI also support pyside2, which
    upgrades from qt4 used in pyside to qt5. Use the argparser module
    for more easily addition of new command line args.

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

1 files changed, 38 insertions, 6 deletions

diff --git a/tools/perf/scripts/python/export-to-sqlite.py b/tools/perf/scripts/python/export-to-sqlite.py
index bf271fbc3a88..f617e518332f 100644
--- a/tools/perf/scripts/python/export-to-sqlite.py
+++ b/tools/perf/scripts/python/export-to-sqlite.py
@@ -21,6 +21,26 @@ import datetime
 # provides LGPL-licensed Python bindings for Qt.  You will also need the package
 # libqt4-sql-sqlite for Qt sqlite3 support.
 #
+# Examples of installing pyside:
+#
+# ubuntu:
+#
+#       $ sudo apt-get install python-pyside.qtsql libqt4-sql-psql
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#
+#               $ sudo apt-get install python3-pyside.qtsql libqt4-sql-psql
+#               $ sudo apt-get install python-pyside2.qtsql libqt5sql5-psql
+#               $ sudo apt-get install python3-pyside2.qtsql libqt5sql5-psql
+# fedora:
+#
+#       $ sudo yum install python-pyside
+#
+#       Alternately, to use Python3 and/or pyside 2, one of the following:
+#               $ sudo yum install python3-pyside
+#               $ pip install --user PySide2
+#               $ pip3 install --user PySide2
+#
 # An example of using this script with Intel PT:
 #
 #       $ perf record -e intel_pt//u ls
@@ -49,7 +69,16 @@ import datetime
 # difference is  the 'transaction' column of the 'samples' table which is
 # renamed 'transaction_' in sqlite because 'transaction' is a reserved word.
 
-from PySide.QtSql import *
+pyside_version_1 = True
+if not "pyside-version-1" in sys.argv:
+        try:
+                from PySide2.QtSql import *
+                pyside_version_1 = False
+        except:
+                pass
+
+if pyside_version_1:
+        from PySide.QtSql import *
 
 sys.path.append(os.environ['PERF_EXEC_PATH'] + \
         '/scripts/python/Perf-Trace-Util/lib/Perf/Trace')
@@ -69,11 +98,12 @@ def printdate(*args, **kw_args):
         print(datetime.datetime.today(), *args, sep=' ', **kw_args)
 
 def usage():
-        printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>]");
-        printerr("where:        columns         'all' or 'branches'");
-        printerr("              calls           'calls' => create calls and call_paths table");
-        printerr("              callchains      'callchains' => create call_paths table");
-        raise Exception("Too few arguments")
+        printerr("Usage is: export-to-sqlite.py <database name> [<columns>] [<calls>] [<callchains>] [<pyside-version-1>]");
+        printerr("where:  columns            'all' or 'branches'");
+        printerr("        calls              'calls' => create calls and call_paths table");
+        printerr("        callchains         'callchains' => create call_paths table");
+        printerr("        pyside-version-1   'pyside-version-1' => use pyside version 1");
+        raise Exception("Too few or bad arguments")
 
 if (len(sys.argv) < 2):
         usage()
@@ -95,6 +125,8 @@ for i in range(3,len(sys.argv)):
                 perf_db_export_calls = True
         elif (sys.argv[i] == "callchains"):
                 perf_db_export_callchains = True
+        elif (sys.argv[i] == "pyside-version-1"):
+                pass
         else:
                 usage()