Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux.git] / tools / perf / scripts / python / export-to-sqlite.py

diff --git a/tools/perf/scripts/python/export-to-sqlite.py b/tools/perf/scripts/python/export-to-sqlite.py
index e4bb82c8aba9e835ea4712e5c00d43443e1d9a9a..ed237f2ed03f7b30f18322d8afffddfde8579891 100644 (file)
--- a/tools/perf/scripts/python/export-to-sqlite.py
+++ b/tools/perf/scripts/python/export-to-sqlite.py
@@ -40,7 +40,7 @@ import datetime
 #      sqlite> .quit
 #
 # An example of using the database is provided by the script
 #      sqlite> .quit
 #
 # An example of using the database is provided by the script

-# call-graph-from-sql.py.  Refer to that script for details.
+# exported-sql-viewer.py.  Refer to that script for details.

 #
 # The database structure is practically the same as created by the script
 # export-to-postgresql.py. Refer to that script for details.  A notable
 #
 # The database structure is practically the same as created by the script
 # export-to-postgresql.py. Refer to that script for details.  A notable


@@ -320,7 +320,7 @@ if perf_db_export_calls:
                        'branch_count,'
                        'call_id,'
                        'return_id,'
                        'branch_count,'
                        'call_id,'
                        'return_id,'

-                       'CASE WHEN flags=1 THEN \'no call\' WHEN flags=2 THEN \'no return\' WHEN flags=3 THEN \'no call/return\' ELSE \'\' END AS flags,'
+                       'CASE WHEN flags=0 THEN \'\' WHEN flags=1 THEN \'no call\' WHEN flags=2 THEN \'no return\' WHEN flags=3 THEN \'no call/return\' WHEN flags=6 THEN \'jump\' ELSE flags END AS flags,'

                        'parent_call_path_id'
                ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id')
 
                        'parent_call_path_id'
                ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id')