perf scripts python: exported-sql-viewer.py: Create new dialog data item classes
Create new dialog data item classes to replace SQLTableDialogDataItem. This separates out different dialog data items and makes it easier to add new ones. SQLTableDialogDataItem is removed in a separate patch because it makes the diff more readable. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
Arnaldo Carvalho de Melo
parent
947cc38d47
commit
1c3ca1b3ae
|
|
@ -1702,6 +1702,265 @@ class SQLTableDialogDataItem():
|
|||
return False
|
||||
return True
|
||||
|
||||
# Line edit data item
|
||||
|
||||
class LineEditDataItem(object):
|
||||
|
||||
def __init__(self, glb, label, placeholder_text, parent, id = ""):
|
||||
self.glb = glb
|
||||
self.label = label
|
||||
self.placeholder_text = placeholder_text
|
||||
self.parent = parent
|
||||
self.id = id
|
||||
|
||||
self.value = ""
|
||||
|
||||
self.widget = QLineEdit()
|
||||
self.widget.editingFinished.connect(self.Validate)
|
||||
self.widget.textChanged.connect(self.Invalidate)
|
||||
self.red = False
|
||||
self.error = ""
|
||||
self.validated = True
|
||||
|
||||
if placeholder_text:
|
||||
self.widget.setPlaceholderText(placeholder_text)
|
||||
|
||||
def TurnTextRed(self):
|
||||
if not self.red:
|
||||
palette = QPalette()
|
||||
palette.setColor(QPalette.Text,Qt.red)
|
||||
self.widget.setPalette(palette)
|
||||
self.red = True
|
||||
|
||||
def TurnTextNormal(self):
|
||||
if self.red:
|
||||
palette = QPalette()
|
||||
self.widget.setPalette(palette)
|
||||
self.red = False
|
||||
|
||||
def InvalidValue(self, value):
|
||||
self.value = ""
|
||||
self.TurnTextRed()
|
||||
self.error = self.label + " invalid value '" + value + "'"
|
||||
self.parent.ShowMessage(self.error)
|
||||
|
||||
def Invalidate(self):
|
||||
self.validated = False
|
||||
|
||||
def DoValidate(self, input_string):
|
||||
self.value = input_string.strip()
|
||||
|
||||
def Validate(self):
|
||||
self.validated = True
|
||||
self.error = ""
|
||||
self.TurnTextNormal()
|
||||
self.parent.ClearMessage()
|
||||
input_string = self.widget.text()
|
||||
if not len(input_string.strip()):
|
||||
self.value = ""
|
||||
return
|
||||
self.DoValidate(input_string)
|
||||
|
||||
def IsValid(self):
|
||||
if not self.validated:
|
||||
self.Validate()
|
||||
if len(self.error):
|
||||
self.parent.ShowMessage(self.error)
|
||||
return False
|
||||
return True
|
||||
|
||||
def IsNumber(self, value):
|
||||
try:
|
||||
x = int(value)
|
||||
except:
|
||||
x = 0
|
||||
return str(x) == value
|
||||
|
||||
# Non-negative integer ranges dialog data item
|
||||
|
||||
class NonNegativeIntegerRangesDataItem(LineEditDataItem):
|
||||
|
||||
def __init__(self, glb, label, placeholder_text, column_name, parent):
|
||||
super(NonNegativeIntegerRangesDataItem, self).__init__(glb, label, placeholder_text, parent)
|
||||
|
||||
self.column_name = column_name
|
||||
|
||||
def DoValidate(self, input_string):
|
||||
singles = []
|
||||
ranges = []
|
||||
for value in [x.strip() for x in input_string.split(",")]:
|
||||
if "-" in value:
|
||||
vrange = value.split("-")
|
||||
if len(vrange) != 2 or not self.IsNumber(vrange[0]) or not self.IsNumber(vrange[1]):
|
||||
return self.InvalidValue(value)
|
||||
ranges.append(vrange)
|
||||
else:
|
||||
if not self.IsNumber(value):
|
||||
return self.InvalidValue(value)
|
||||
singles.append(value)
|
||||
ranges = [("(" + self.column_name + " >= " + r[0] + " AND " + self.column_name + " <= " + r[1] + ")") for r in ranges]
|
||||
if len(singles):
|
||||
ranges.append(self.column_name + " IN (" + ",".join(singles) + ")")
|
||||
self.value = " OR ".join(ranges)
|
||||
|
||||
# Dialog data item converted and validated using a SQL table
|
||||
|
||||
class SQLTableDataItem(LineEditDataItem):
|
||||
|
||||
def __init__(self, glb, label, placeholder_text, table_name, match_column, column_name1, column_name2, parent):
|
||||
super(SQLTableDataItem, self).__init__(glb, label, placeholder_text, parent)
|
||||
|
||||
self.table_name = table_name
|
||||
self.match_column = match_column
|
||||
self.column_name1 = column_name1
|
||||
self.column_name2 = column_name2
|
||||
|
||||
def ValueToIds(self, value):
|
||||
ids = []
|
||||
query = QSqlQuery(self.glb.db)
|
||||
stmt = "SELECT id FROM " + self.table_name + " WHERE " + self.match_column + " = '" + value + "'"
|
||||
ret = query.exec_(stmt)
|
||||
if ret:
|
||||
while query.next():
|
||||
ids.append(str(query.value(0)))
|
||||
return ids
|
||||
|
||||
def DoValidate(self, input_string):
|
||||
all_ids = []
|
||||
for value in [x.strip() for x in input_string.split(",")]:
|
||||
ids = self.ValueToIds(value)
|
||||
if len(ids):
|
||||
all_ids.extend(ids)
|
||||
else:
|
||||
return self.InvalidValue(value)
|
||||
self.value = self.column_name1 + " IN (" + ",".join(all_ids) + ")"
|
||||
if self.column_name2:
|
||||
self.value = "( " + self.value + " OR " + self.column_name2 + " IN (" + ",".join(all_ids) + ") )"
|
||||
|
||||
# Sample time ranges dialog data item converted and validated using 'samples' SQL table
|
||||
|
||||
class SampleTimeRangesDataItem(LineEditDataItem):
|
||||
|
||||
def __init__(self, glb, label, placeholder_text, column_name, parent):
|
||||
self.column_name = column_name
|
||||
|
||||
self.last_id = 0
|
||||
self.first_time = 0
|
||||
self.last_time = 2 ** 64
|
||||
|
||||
query = QSqlQuery(glb.db)
|
||||
QueryExec(query, "SELECT id, time FROM samples ORDER BY id DESC LIMIT 1")
|
||||
if query.next():
|
||||
self.last_id = int(query.value(0))
|
||||
self.last_time = int(query.value(1))
|
||||
QueryExec(query, "SELECT time FROM samples WHERE time != 0 ORDER BY id LIMIT 1")
|
||||
if query.next():
|
||||
self.first_time = int(query.value(0))
|
||||
if placeholder_text:
|
||||
placeholder_text += ", between " + str(self.first_time) + " and " + str(self.last_time)
|
||||
|
||||
super(SampleTimeRangesDataItem, self).__init__(glb, label, placeholder_text, parent)
|
||||
|
||||
def IdBetween(self, query, lower_id, higher_id, order):
|
||||
QueryExec(query, "SELECT id FROM samples WHERE id > " + str(lower_id) + " AND id < " + str(higher_id) + " ORDER BY id " + order + " LIMIT 1")
|
||||
if query.next():
|
||||
return True, int(query.value(0))
|
||||
else:
|
||||
return False, 0
|
||||
|
||||
def BinarySearchTime(self, lower_id, higher_id, target_time, get_floor):
|
||||
query = QSqlQuery(self.glb.db)
|
||||
while True:
|
||||
next_id = int((lower_id + higher_id) / 2)
|
||||
QueryExec(query, "SELECT time FROM samples WHERE id = " + str(next_id))
|
||||
if not query.next():
|
||||
ok, dbid = self.IdBetween(query, lower_id, next_id, "DESC")
|
||||
if not ok:
|
||||
ok, dbid = self.IdBetween(query, next_id, higher_id, "")
|
||||
if not ok:
|
||||
return str(higher_id)
|
||||
next_id = dbid
|
||||
QueryExec(query, "SELECT time FROM samples WHERE id = " + str(next_id))
|
||||
next_time = int(query.value(0))
|
||||
if get_floor:
|
||||
if target_time > next_time:
|
||||
lower_id = next_id
|
||||
else:
|
||||
higher_id = next_id
|
||||
if higher_id <= lower_id + 1:
|
||||
return str(higher_id)
|
||||
else:
|
||||
if target_time >= next_time:
|
||||
lower_id = next_id
|
||||
else:
|
||||
higher_id = next_id
|
||||
if higher_id <= lower_id + 1:
|
||||
return str(lower_id)
|
||||
|
||||
def ConvertRelativeTime(self, val):
|
||||
mult = 1
|
||||
suffix = val[-2:]
|
||||
if suffix == "ms":
|
||||
mult = 1000000
|
||||
elif suffix == "us":
|
||||
mult = 1000
|
||||
elif suffix == "ns":
|
||||
mult = 1
|
||||
else:
|
||||
return val
|
||||
val = val[:-2].strip()
|
||||
if not self.IsNumber(val):
|
||||
return val
|
||||
val = int(val) * mult
|
||||
if val >= 0:
|
||||
val += self.first_time
|
||||
else:
|
||||
val += self.last_time
|
||||
return str(val)
|
||||
|
||||
def ConvertTimeRange(self, vrange):
|
||||
if vrange[0] == "":
|
||||
vrange[0] = str(self.first_time)
|
||||
if vrange[1] == "":
|
||||
vrange[1] = str(self.last_time)
|
||||
vrange[0] = self.ConvertRelativeTime(vrange[0])
|
||||
vrange[1] = self.ConvertRelativeTime(vrange[1])
|
||||
if not self.IsNumber(vrange[0]) or not self.IsNumber(vrange[1]):
|
||||
return False
|
||||
beg_range = max(int(vrange[0]), self.first_time)
|
||||
end_range = min(int(vrange[1]), self.last_time)
|
||||
if beg_range > self.last_time or end_range < self.first_time:
|
||||
return False
|
||||
vrange[0] = self.BinarySearchTime(0, self.last_id, beg_range, True)
|
||||
vrange[1] = self.BinarySearchTime(1, self.last_id + 1, end_range, False)
|
||||
return True
|
||||
|
||||
def AddTimeRange(self, value, ranges):
|
||||
n = value.count("-")
|
||||
if n == 1:
|
||||
pass
|
||||
elif n == 2:
|
||||
if value.split("-")[1].strip() == "":
|
||||
n = 1
|
||||
elif n == 3:
|
||||
n = 2
|
||||
else:
|
||||
return False
|
||||
pos = findnth(value, "-", n)
|
||||
vrange = [value[:pos].strip() ,value[pos+1:].strip()]
|
||||
if self.ConvertTimeRange(vrange):
|
||||
ranges.append(vrange)
|
||||
return True
|
||||
return False
|
||||
|
||||
def DoValidate(self, input_string):
|
||||
ranges = []
|
||||
for value in [x.strip() for x in input_string.split(",")]:
|
||||
if not self.AddTimeRange(value, ranges):
|
||||
return self.InvalidValue(value)
|
||||
ranges = [("(" + self.column_name + " >= " + r[0] + " AND " + self.column_name + " <= " + r[1] + ")") for r in ranges]
|
||||
self.value = " OR ".join(ranges)
|
||||
|
||||
# Report Dialog Base
|
||||
|
||||
class ReportDialogBase(QDialog):
|
||||
|
|
@ -1716,7 +1975,7 @@ class ReportDialogBase(QDialog):
|
|||
self.setWindowTitle(title)
|
||||
self.setMinimumWidth(600)
|
||||
|
||||
self.data_items = [SQLTableDialogDataItem(glb, *x, parent=self) for x in items]
|
||||
self.data_items = [x(glb, self) for x in items]
|
||||
|
||||
self.partial = partial
|
||||
|
||||
|
|
@ -1751,7 +2010,9 @@ class ReportDialogBase(QDialog):
|
|||
|
||||
def Ok(self):
|
||||
vars = self.report_vars
|
||||
vars.name = self.data_items[0].value
|
||||
for d in self.data_items:
|
||||
if d.id == "REPORTNAME":
|
||||
vars.name = d.value
|
||||
if not vars.name:
|
||||
self.ShowMessage("Report name is required")
|
||||
return
|
||||
|
|
@ -1785,17 +2046,15 @@ class SelectedBranchDialog(ReportDialogBase):
|
|||
|
||||
def __init__(self, glb, parent=None):
|
||||
title = "Selected Branches"
|
||||
items = (
|
||||
("Report name:", "Enter a name to appear in the window title bar", "", "", "", ""),
|
||||
("Time ranges:", "Enter time ranges", "<timeranges>", "", "samples.id", ""),
|
||||
("CPUs:", "Enter CPUs or ranges e.g. 0,5-6", "<ranges>", "", "cpu", ""),
|
||||
("Commands:", "Only branches with these commands will be included", "comms", "comm", "comm_id", ""),
|
||||
("PIDs:", "Only branches with these process IDs will be included", "threads", "pid", "thread_id", ""),
|
||||
("TIDs:", "Only branches with these thread IDs will be included", "threads", "tid", "thread_id", ""),
|
||||
("DSOs:", "Only branches with these DSOs will be included", "dsos", "short_name", "samples.dso_id", "to_dso_id"),
|
||||
("Symbols:", "Only branches with these symbols will be included", "symbols", "name", "symbol_id", "to_symbol_id"),
|
||||
("Raw SQL clause: ", "Enter a raw SQL WHERE clause", "", "", "", ""),
|
||||
)
|
||||
items = (lambda g, p: LineEditDataItem(g, "Report name:", "Enter a name to appear in the window title bar", p, "REPORTNAME"),
|
||||
lambda g, p: SampleTimeRangesDataItem(g, "Time ranges:", "Enter time ranges", "samples.id", p),
|
||||
lambda g, p: NonNegativeIntegerRangesDataItem(g, "CPUs:", "Enter CPUs or ranges e.g. 0,5-6", "cpu", p),
|
||||
lambda g, p: SQLTableDataItem(g, "Commands:", "Only branches with these commands will be included", "comms", "comm", "comm_id", "", p),
|
||||
lambda g, p: SQLTableDataItem(g, "PIDs:", "Only branches with these process IDs will be included", "threads", "pid", "thread_id", "", p),
|
||||
lambda g, p: SQLTableDataItem(g, "TIDs:", "Only branches with these thread IDs will be included", "threads", "tid", "thread_id", "", p),
|
||||
lambda g, p: SQLTableDataItem(g, "DSOs:", "Only branches with these DSOs will be included", "dsos", "short_name", "samples.dso_id", "to_dso_id", p),
|
||||
lambda g, p: SQLTableDataItem(g, "Symbols:", "Only branches with these symbols will be included", "symbols", "name", "symbol_id", "to_symbol_id", p),
|
||||
lambda g, p: LineEditDataItem(g, "Raw SQL clause: ", "Enter a raw SQL WHERE clause", p))
|
||||
super(SelectedBranchDialog, self).__init__(glb, title, items, True, parent)
|
||||
|
||||
# Event list
|
||||
|
|
|
|||
Loading…
Reference in New Issue