imcarlost/pidcat-repl
1
0
Fork 0
mirror of https://github.com/imcarlost/pidcat-repl.git synced 2026-08-08 23:17:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from JakeWharton/jw/five-one

Browse Source 
Add support for Android 5.1.
This commit is contained in:
Jake Wharton
2015-03-14 16:14:14 -05:00
parent d23340de05 d85c10c25d
commit b050e6a491
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pidcat.py
+5
View File
@@ -145,6 +145,7 @@ TAGTYPES = {
PID_LINE = re.compile(r'^\w+\s+(\w+)\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w\s([\w|\.]+)$') PID_LINE = re.compile(r'^\w+\s+(\w+)\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w\s([\w|\.]+)$')
PID_START = re.compile(r'^.*: Start proc ([a-zA-Z0-9._:]+) for ([a-z]+ [^:]+): pid=(\d+) uid=(\d+) gids=(.*)$') PID_START = re.compile(r'^.*: Start proc ([a-zA-Z0-9._:]+) for ([a-z]+ [^:]+): pid=(\d+) uid=(\d+) gids=(.*)$')
PID_START_5_1 = re.compile(r'^.*: Start proc (\d+):([a-zA-Z0-9._:]+)/[a-z0-9]+ for (.*)$')
PID_START_DALVIK = re.compile(r'^E/dalvikvm\(\s*(\d+)\): >>>>> ([a-zA-Z0-9._:]+) \[ userId:0 \| appId:(\d+) \]$') PID_START_DALVIK = re.compile(r'^E/dalvikvm\(\s*(\d+)\): >>>>> ([a-zA-Z0-9._:]+) \[ userId:0 \| appId:(\d+) \]$')
PID_KILL = re.compile(r'^Killing (\d+):([a-zA-Z0-9._:]+)/[^:]+: (.*)$') PID_KILL = re.compile(r'^Killing (\d+):([a-zA-Z0-9._:]+)/[^:]+: (.*)$')
PID_LEAVE = re.compile(r'^No longer want ([a-zA-Z0-9._:]+) \(pid (\d+)\): .*$') PID_LEAVE = re.compile(r'^No longer want ([a-zA-Z0-9._:]+) \(pid (\d+)\): .*$')
@@ -219,6 +220,10 @@ def parse_death(tag, message):
return None, None return None, None
def parse_start_proc(line): def parse_start_proc(line):
start = PID_START_5_1.match(line)
if start is not None:
line_pid, line_package, target = start.groups()
return line_package, target, line_pid, '', ''
start = PID_START.match(line) start = PID_START.match(line)
if start is not None: if start is not None:
line_package, target, line_pid, line_uid, line_gids = start.groups() line_package, target, line_pid, line_uid, line_gids = start.groups()