Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux.git] / tools / perf / scripts / python / exported-sql-viewer.py

diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index 6e7934f2ac9a31549cddfd1a669e6cc7f61b613e..61b3911d91e6b0342e49a5a69fc5e8ce2d7d73ef 100755 (executable)
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -392,7 +392,7 @@ class FindBar():
                self.hbox.addWidget(self.close_button)
 
                self.bar = QWidget()
-               self.bar.setLayout(self.hbox);
+               self.bar.setLayout(self.hbox)
                self.bar.hide()
 
        def Widget(self):
@@ -470,7 +470,7 @@ class CallGraphLevelItemBase(object):
                self.params = params
                self.row = row
                self.parent_item = parent_item
-               self.query_done = False;
+               self.query_done = False
                self.child_count = 0
                self.child_items = []
                if parent_item:
@@ -517,7 +517,7 @@ class CallGraphLevelTwoPlusItemBase(CallGraphLevelItemBase):
                self.time = time
 
        def Select(self):
-               self.query_done = True;
+               self.query_done = True
                query = QSqlQuery(self.glb.db)
                if self.params.have_ipc:
                        ipc_str = ", SUM(insn_count), SUM(cyc_count)"
@@ -604,7 +604,7 @@ class CallGraphLevelOneItem(CallGraphLevelItemBase):
                self.dbid = comm_id
 
        def Select(self):
-               self.query_done = True;
+               self.query_done = True
                query = QSqlQuery(self.glb.db)
                QueryExec(query, "SELECT thread_id, pid, tid"
                                        " FROM comm_threads"
@@ -622,9 +622,12 @@ class CallGraphRootItem(CallGraphLevelItemBase):
        def __init__(self, glb, params):
                super(CallGraphRootItem, self).__init__(glb, params, 0, None)
                self.dbid = 0
-               self.query_done = True;
+               self.query_done = True
+               if_has_calls = ""
+               if IsSelectable(glb.db, "comms", columns = "has_calls"):
+                       if_has_calls = " WHERE has_calls = TRUE"
                query = QSqlQuery(glb.db)
-               QueryExec(query, "SELECT id, comm FROM comms")
+               QueryExec(query, "SELECT id, comm FROM comms" + if_has_calls)
                while query.next():
                        if not query.value(0):
                                continue
@@ -793,7 +796,7 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
                self.time = time
 
        def Select(self):
-               self.query_done = True;
+               self.query_done = True
                if self.calls_id == 0:
                        comm_thread = " AND comm_id = " + str(self.comm_id) + " AND thread_id = " + str(self.thread_id)
                else:
@@ -881,7 +884,7 @@ class CallTreeLevelOneItem(CallGraphLevelItemBase):
                self.dbid = comm_id
 
        def Select(self):
-               self.query_done = True;
+               self.query_done = True
                query = QSqlQuery(self.glb.db)
                QueryExec(query, "SELECT thread_id, pid, tid"
                                        " FROM comm_threads"
@@ -899,9 +902,12 @@ class CallTreeRootItem(CallGraphLevelItemBase):
        def __init__(self, glb, params):
                super(CallTreeRootItem, self).__init__(glb, params, 0, None)
                self.dbid = 0
-               self.query_done = True;
+               self.query_done = True
+               if_has_calls = ""
+               if IsSelectable(glb.db, "comms", columns = "has_calls"):
+                       if_has_calls = " WHERE has_calls = TRUE"
                query = QSqlQuery(glb.db)
-               QueryExec(query, "SELECT id, comm FROM comms")
+               QueryExec(query, "SELECT id, comm FROM comms" + if_has_calls)
                while query.next():
                        if not query.value(0):
                                continue
@@ -971,7 +977,7 @@ class VBox():
 
        def __init__(self, w1, w2, w3=None):
                self.vbox = QWidget()
-               self.vbox.setLayout(QVBoxLayout());
+               self.vbox.setLayout(QVBoxLayout())
 
                self.vbox.layout().setContentsMargins(0, 0, 0, 0)
 
@@ -1391,7 +1397,7 @@ class FetchMoreRecordsBar():
                self.hbox.addWidget(self.close_button)
 
                self.bar = QWidget()
-               self.bar.setLayout(self.hbox);
+               self.bar.setLayout(self.hbox)
                self.bar.show()
 
                self.in_progress = False
@@ -2206,7 +2212,7 @@ class ReportDialogBase(QDialog):
                self.vbox.addLayout(self.grid)
                self.vbox.addLayout(self.hbox)
 
-               self.setLayout(self.vbox);
+               self.setLayout(self.vbox)
 
        def Ok(self):
                vars = self.report_vars
@@ -3139,7 +3145,7 @@ class AboutDialog(QDialog):
                self.vbox = QVBoxLayout()
                self.vbox.addWidget(self.text)
 
-               self.setLayout(self.vbox);
+               self.setLayout(self.vbox)
 
 # Font resize