1 files changed, 54 insertions, 23 deletions

diff --git a/tools/perf/scripts/python/export-to-postgresql.py b/tools/perf/scripts/python/export-to-postgresql.py
index 0564dd7377f2..c3eae1d77d36 100644
--- a/tools/perf/scripts/python/export-to-postgresql.py
+++ b/tools/perf/scripts/python/export-to-postgresql.py
@@ -10,6 +10,8 @@
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 # more details.
 
+from __future__ import print_function
+
 import os
 import sys
 import struct
@@ -199,6 +201,18 @@ import datetime
 
 from PySide.QtSql import *
 
+if sys.version_info < (3, 0):
+        def toserverstr(str):
+                return str
+        def toclientstr(str):
+                return str
+else:
+        # Assume UTF-8 server_encoding and client_encoding
+        def toserverstr(str):
+                return bytes(str, "UTF_8")
+        def toclientstr(str):
+                return bytes(str, "UTF_8")
+
 # Need to access PostgreSQL C library directly to use COPY FROM STDIN
 from ctypes import *
 libpq = CDLL("libpq.so.5")
@@ -234,12 +248,17 @@ perf_db_export_mode = True
 perf_db_export_calls = False
 perf_db_export_callchains = False
 
+def printerr(*args, **kw_args):
+        print(*args, file=sys.stderr, **kw_args)
+
+def printdate(*args, **kw_args):
+        print(datetime.datetime.today(), *args, sep=' ', **kw_args)
 
 def usage():
-        print >> sys.stderr, "Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]"
-        print >> sys.stderr, "where:    columns         'all' or 'branches'"
-        print >> sys.stderr, "          calls           'calls' => create calls and call_paths table"
-        print >> sys.stderr, "          callchains      'callchains' => create call_paths table"
+        printerr("Usage is: export-to-postgresql.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")
 
 if (len(sys.argv) < 2):
@@ -273,7 +292,7 @@ def do_query(q, s):
                 return
         raise Exception("Query failed: " + q.lastError().text())
 
-print datetime.datetime.today(), "Creating database..."
+printdate("Creating database...")
 
 db = QSqlDatabase.addDatabase('QPSQL')
 query = QSqlQuery(db)
@@ -394,7 +413,8 @@ if perf_db_export_calls:
                 'call_id        bigint,'
                 'return_id      bigint,'
                 'parent_call_path_id    bigint,'
-                'flags          integer)')
+                'flags          integer,'
+                'parent_id      bigint)')
 
 do_query(query, 'CREATE VIEW machines_view AS '
         'SELECT '
@@ -478,8 +498,9 @@ if perf_db_export_calls:
                         '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,'
-                        'parent_call_path_id'
+                        '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 CAST ( flags AS VARCHAR(6) ) END AS flags,'
+                        'parent_call_path_id,'
+                        'calls.parent_id'
                 ' FROM calls INNER JOIN call_paths ON call_paths.id = call_path_id')
 
 do_query(query, 'CREATE VIEW samples_view AS '
@@ -504,12 +525,12 @@ do_query(query, 'CREATE VIEW samples_view AS '
         ' FROM samples')
 
 
-file_header = struct.pack("!11sii", "PGCOPY\n\377\r\n\0", 0, 0)
-file_trailer = "\377\377"
+file_header = struct.pack("!11sii", b"PGCOPY\n\377\r\n\0", 0, 0)
+file_trailer = b"\377\377"
 
 def open_output_file(file_name):
         path_name = output_dir_name + "/" + file_name
-        file = open(path_name, "w+")
+        file = open(path_name, "wb+")
         file.write(file_header)
         return file
 
@@ -524,13 +545,13 @@ def copy_output_file_direct(file, table_name):
 
 # Use COPY FROM STDIN because security may prevent postgres from accessing the files directly
 def copy_output_file(file, table_name):
-        conn = PQconnectdb("dbname = " + dbname)
+        conn = PQconnectdb(toclientstr("dbname = " + dbname))
         if (PQstatus(conn)):
                 raise Exception("COPY FROM STDIN PQconnectdb failed")
         file.write(file_trailer)
         file.seek(0)
         sql = "COPY " + table_name + " FROM STDIN (FORMAT 'binary')"
-        res = PQexec(conn, sql)
+        res = PQexec(conn, toclientstr(sql))
         if (PQresultStatus(res) != 4):
                 raise Exception("COPY FROM STDIN PQexec failed")
         data = file.read(65536)
@@ -564,7 +585,7 @@ if perf_db_export_calls:
         call_file               = open_output_file("call_table.bin")
 
 def trace_begin():
-        print datetime.datetime.today(), "Writing to intermediate files..."
+        printdate("Writing to intermediate files...")
         # id == 0 means unknown.  It is easier to create records for them than replace the zeroes with NULLs
         evsel_table(0, "unknown")
         machine_table(0, 0, "unknown")
@@ -575,11 +596,12 @@ def trace_begin():
         sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         if perf_db_export_calls or perf_db_export_callchains:
                 call_path_table(0, 0, 0, 0)
+                call_return_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 
 unhandled_count = 0
 
 def trace_end():
-        print datetime.datetime.today(), "Copying to database..."
+        printdate("Copying to database...")
         copy_output_file(evsel_file,            "selected_events")
         copy_output_file(machine_file,          "machines")
         copy_output_file(thread_file,           "threads")
@@ -594,7 +616,7 @@ def trace_end():
         if perf_db_export_calls:
                 copy_output_file(call_file,             "calls")
 
-        print datetime.datetime.today(), "Removing intermediate files..."
+        printdate("Removing intermediate files...")
         remove_output_file(evsel_file)
         remove_output_file(machine_file)
         remove_output_file(thread_file)
@@ -609,7 +631,7 @@ def trace_end():
         if perf_db_export_calls:
                 remove_output_file(call_file)
         os.rmdir(output_dir_name)
-        print datetime.datetime.today(), "Adding primary keys"
+        printdate("Adding primary keys")
         do_query(query, 'ALTER TABLE selected_events ADD PRIMARY KEY (id)')
         do_query(query, 'ALTER TABLE machines        ADD PRIMARY KEY (id)')
         do_query(query, 'ALTER TABLE threads         ADD PRIMARY KEY (id)')
@@ -624,7 +646,7 @@ def trace_end():
         if perf_db_export_calls:
                 do_query(query, 'ALTER TABLE calls           ADD PRIMARY KEY (id)')
 
-        print datetime.datetime.today(), "Adding foreign keys"
+        printdate("Adding foreign keys")
         do_query(query, 'ALTER TABLE threads '
                                         'ADD CONSTRAINT machinefk  FOREIGN KEY (machine_id)   REFERENCES machines   (id),'
                                         'ADD CONSTRAINT processfk  FOREIGN KEY (process_id)   REFERENCES threads    (id)')
@@ -657,10 +679,11 @@ def trace_end():
                                         'ADD CONSTRAINT returnfk    FOREIGN KEY (return_id)    REFERENCES samples    (id),'
                                         'ADD CONSTRAINT parent_call_pathfk FOREIGN KEY (parent_call_path_id) REFERENCES call_paths (id)')
                 do_query(query, 'CREATE INDEX pcpid_idx ON calls (parent_call_path_id)')
+                do_query(query, 'CREATE INDEX pid_idx ON calls (parent_id)')
 
         if (unhandled_count):
-                print datetime.datetime.today(), "Warning: ", unhandled_count, " unhandled events"
-        print datetime.datetime.today(), "Done"
+                printdate("Warning: ", unhandled_count, " unhandled events")
+        printdate("Done")
 
 def trace_unhandled(event_name, context, event_fields_dict):
         global unhandled_count
@@ -670,12 +693,14 @@ def sched__sched_switch(*x):
         pass
 
 def evsel_table(evsel_id, evsel_name, *x):
+        evsel_name = toserverstr(evsel_name)
         n = len(evsel_name)
         fmt = "!hiqi" + str(n) + "s"
         value = struct.pack(fmt, 2, 8, evsel_id, n, evsel_name)
         evsel_file.write(value)
 
 def machine_table(machine_id, pid, root_dir, *x):
+        root_dir = toserverstr(root_dir)
         n = len(root_dir)
         fmt = "!hiqiii" + str(n) + "s"
         value = struct.pack(fmt, 3, 8, machine_id, 4, pid, n, root_dir)
@@ -686,6 +711,7 @@ def thread_table(thread_id, machine_id, process_id, pid, tid, *x):
         thread_file.write(value)
 
 def comm_table(comm_id, comm_str, *x):
+        comm_str = toserverstr(comm_str)
         n = len(comm_str)
         fmt = "!hiqi" + str(n) + "s"
         value = struct.pack(fmt, 2, 8, comm_id, n, comm_str)
@@ -697,6 +723,9 @@ def comm_thread_table(comm_thread_id, comm_id, thread_id, *x):
         comm_thread_file.write(value)
 
 def dso_table(dso_id, machine_id, short_name, long_name, build_id, *x):
+        short_name = toserverstr(short_name)
+        long_name = toserverstr(long_name)
+        build_id = toserverstr(build_id)
         n1 = len(short_name)
         n2 = len(long_name)
         n3 = len(build_id)
@@ -705,12 +734,14 @@ def dso_table(dso_id, machine_id, short_name, long_name, build_id, *x):
         dso_file.write(value)
 
 def symbol_table(symbol_id, dso_id, sym_start, sym_end, binding, symbol_name, *x):
+        symbol_name = toserverstr(symbol_name)
         n = len(symbol_name)
         fmt = "!hiqiqiqiqiii" + str(n) + "s"
         value = struct.pack(fmt, 6, 8, symbol_id, 8, dso_id, 8, sym_start, 8, sym_end, 4, binding, n, symbol_name)
         symbol_file.write(value)
 
 def branch_type_table(branch_type, name, *x):
+        name = toserverstr(name)
         n = len(name)
         fmt = "!hiii" + str(n) + "s"
         value = struct.pack(fmt, 2, 4, branch_type, n, name)
@@ -728,7 +759,7 @@ def call_path_table(cp_id, parent_id, symbol_id, ip, *x):
         value = struct.pack(fmt, 4, 8, cp_id, 8, parent_id, 8, symbol_id, 8, ip)
         call_path_file.write(value)
 
-def call_return_table(cr_id, thread_id, comm_id, call_path_id, call_time, return_time, branch_count, call_id, return_id, parent_call_path_id, flags, *x):
-        fmt = "!hiqiqiqiqiqiqiqiqiqiqii"
-        value = struct.pack(fmt, 11, 8, cr_id, 8, thread_id, 8, comm_id, 8, call_path_id, 8, call_time, 8, return_time, 8, branch_count, 8, call_id, 8, return_id, 8, parent_call_path_id, 4, flags)
+def call_return_table(cr_id, thread_id, comm_id, call_path_id, call_time, return_time, branch_count, call_id, return_id, parent_call_path_id, flags, parent_id, *x):
+        fmt = "!hiqiqiqiqiqiqiqiqiqiqiiiq"
+        value = struct.pack(fmt, 12, 8, cr_id, 8, thread_id, 8, comm_id, 8, call_path_id, 8, call_time, 8, return_time, 8, branch_count, 8, call_id, 8, return_id, 8, parent_call_path_id, 4, flags, 8, parent_id)
         call_file.write(value)