mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Use less regex matching to parse lines (does not provide a performance gain though)

Browse source
This commit is contained in:
René Stadler 2007-11-15 15:06:37 +02:00 committed by Stefan Sauer
parent df2d890d40
commit b3f21b5a59
2 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
debug-viewer/GstDebugViewer/Data.py
View file

@ -112,9 +112,7 @@ def default_log_line_regex_ ():
# "0x8165430 " # "0x8165430 "
THREAD = r"(0x[0-9a-f]+) +" #r"\((0x[0-9a-f]+) - " THREAD = r"(0x[0-9a-f]+) +" #r"\((0x[0-9a-f]+) - "
# "0:00:00.777913000 " # "0:00:00.777913000 "
#TIME = r"([0-9]+:[0-9][0-9]:[0-9][0-9]\.[0-9]+) +" TIME = r"([0-9]+:[0-9][0-9]:[0-9][0-9]\.[0-9]+) +"
TIME = " +" # Only eating whitespace before PID away, we parse timestamps
# without regex.
CATEGORY = "([A-Za-z_-]+) +" # "GST_REFCOUNTING ", "flacdec " CATEGORY = "([A-Za-z_-]+) +" # "GST_REFCOUNTING ", "flacdec "
# " 3089 " # " 3089 "
PID = r"([0-9]+) +" PID = r"([0-9]+) +"
@ -126,10 +124,13 @@ def default_log_line_regex_ ():
OBJECT = "(?:<([^>]+)>)?" OBJECT = "(?:<([^>]+)>)?"
MESSAGE = " (.+)" MESSAGE = " (.+)"
expressions = [TIME, PID, THREAD, LEVEL, CATEGORY, FILENAME, LINE, FUNCTION, expressions = [CATEGORY, FILENAME, LINE, FUNCTION, OBJECT, MESSAGE]
OBJECT, MESSAGE] # New log format:
## expressions = [LEVEL, THREAD, TIME, CATEGORY, PID, FILENAME, LINE, ## expressions = [TIME, PID, THREAD, LEVEL, CATEGORY, FILENAME, LINE, FUNCTION,
## FUNCTION, OBJECT, MESSAGE] ## OBJECT, MESSAGE]
# Old log format:
## expressions = [LEVEL, THREAD, TIME, CATEGORY, PID, FILENAME, LINE,
## FUNCTION, OBJECT, MESSAGE]
return expressions return expressions

33
debug-viewer/GstDebugViewer/GUI.py
View file

@ -217,22 +217,35 @@ class LazyLogModel (LogModelBase):
line = self.__fileobj.readline () line = self.__fileobj.readline ()
ts_len = 17 ts_len = 17
ts = Data.parse_time (line[:ts_len]) pid_len = 5
match = self.__line_regex.match (line[ts_len:-len (os.linesep)]) thread_len = 9 # FIXME: %p, so this should be larger on a 64 bit CPU, no?
level_len = 5
non_regex_len = ts_len + 1 + pid_len + thread_len + 1 + level_len + 1
non_regex_line = line[:non_regex_len]
regex_line = line[non_regex_len:]
try:
prefix = non_regex_line.rstrip ()
while " " in prefix:
prefix = prefix.replace (" ", " ")
ts_s, pid_s, thread_s, level_s = prefix.split (" ")
ts = Data.parse_time (ts_s)
pid = int (pid_s)
thread = int (thread_s, 16)
level = Data.DebugLevel (level_s)
match = self.__line_regex.match (regex_line[:-len (os.linesep)].lstrip ())
except ValueError:
match = None
if match is None: if match is None:
# FIXME? # FIXME?
groups = [ts, 0, 0, Data.DebugLevelNone, "", "", 0, "", "", line[ts_len:-len (os.linesep)]] groups = [0, 0, 0, Data.DebugLevelNone, "", "", 0, "", "", line[ts_len:-len (os.linesep)]]
else: else:
groups = [ts] + list (match.groups ()) groups = [ts, pid, thread, level] + list (match.groups ())
# TODO: Figure out how much string interning can save here and how # TODO: Figure out how much string interning can save here and how
# much run time speed it costs! # much run time speed it costs!
groups[1] = int (groups[1]) # pid
groups[2] = int (groups[2], 16) # thread pointer
try:
groups[3] = Data.DebugLevel (groups[3])
except ValueError:
groups[3] = Data.DebugLevelNone
groups[6] = int (groups[6]) # line groups[6] = int (groups[6]) # line
groups[8] = groups[8] or "" # object (optional) groups[8] = groups[8] or "" # object (optional)