mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 01:30:38 +00:00
Correctly handle variable length thread address formatting
This commit is contained in:
parent
df353a932a
commit
2d6b01144d
2 changed files with 8 additions and 5 deletions
|
@ -194,10 +194,9 @@ class LineCache (Producer):
|
||||||
# FIXME: Duplicated from GUI.LazyLogModel!
|
# FIXME: Duplicated from GUI.LazyLogModel!
|
||||||
ts_len = 17
|
ts_len = 17
|
||||||
pid_len = 5
|
pid_len = 5
|
||||||
thread_len = 9 # FIXME: %p, so this should be larger on a 64 bit CPU, no?
|
# Need to find out thread len below...
|
||||||
level_len = 5
|
level_len = 5
|
||||||
level_offset = ts_len + 1 + pid_len + 1 + thread_len + 1
|
thread_start = ts_len + 1 + pid_len + 1
|
||||||
level_end = level_offset + 1
|
|
||||||
dict_levels = {"D" : debug_level_debug, "L" : debug_level_log,
|
dict_levels = {"D" : debug_level_debug, "L" : debug_level_log,
|
||||||
"I" : debug_level_info, "E" : debug_level_error,
|
"I" : debug_level_info, "E" : debug_level_error,
|
||||||
"W" : debug_level_warning, " " : debug_level_none}
|
"W" : debug_level_warning, " " : debug_level_none}
|
||||||
|
@ -221,8 +220,10 @@ class LineCache (Producer):
|
||||||
if line[1] != ":" or line[4] != ":" or line[7] != ".":
|
if line[1] != ":" or line[4] != ":" or line[7] != ".":
|
||||||
# No timestamp at start, ignore line:
|
# No timestamp at start, ignore line:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
thread_end = line.find (" ", thread_start)
|
||||||
offsets.append (offset)
|
offsets.append (offset)
|
||||||
levels.append (dict_levels[line[level_offset:level_end]])
|
levels.append (dict_levels[line[thread_end + 1:thread_end + 2]])
|
||||||
i += 1
|
i += 1
|
||||||
if i >= limit:
|
if i >= limit:
|
||||||
i = 0
|
i = 0
|
||||||
|
|
|
@ -278,7 +278,9 @@ class LazyLogModel (LogModelBase):
|
||||||
|
|
||||||
ts_len = 17
|
ts_len = 17
|
||||||
pid_len = 5
|
pid_len = 5
|
||||||
thread_len = 9 # FIXME: %p, so this should be larger on a 64 bit CPU, no?
|
|
||||||
|
thread_pos = ts_len + 1 + pid_len + 1
|
||||||
|
thread_len = line[thread_pos:thread_pos + 32].find (" ")
|
||||||
level_len = 5
|
level_len = 5
|
||||||
|
|
||||||
non_regex_len = ts_len + 1 + pid_len + thread_len + 1 + level_len + 1
|
non_regex_len = ts_len + 1 + pid_len + thread_len + 1 + level_len + 1
|
||||||
|
|
Loading…
Reference in a new issue