pykdebugparser 1.5.0__py2.py3-none-any.whl → 1.6.1__py2.py3-none-any.whl

pykdebugparser/highlight.py

@@ -1,134 +1,66 @@
-"""Syntax highlighting of trace lines, as pygments' C lexer and `stata-dark` true color formatter do it.
+"""Syntax highlighting of trace lines, such as `open("/etc/hosts", O_RDONLY), fd: 3`.
 
-pygments lexes each line through a general state machine, which formats about 19k lines/s: too slow for a live
-trace. Trace lines use a small part of C's syntax, so `highlight` tokenizes them with one regular expression that
-follows the same rules, and produces the same escape sequences. A line with anything outside that part (a label at its
-start, `;` or `{`, comments, character literals, string escapes, floating-point numbers, ...) goes to pygments, so the
-result is always pygments' own.
+Lines are colored with the terminal's 16 basic colors, so they follow its theme:
+
+- the call or event name at the start, bold;
+- strings (paths, symbols, ...), green;
+- numbers, cyan;
+- constants (flags, enums, signals: `O_RDONLY`, `KERN_SUCCESS`, `SIGKILL`), yellow;
+- an error (`errno: ENOENT(2)`, a `KERN_*` failure), red;
+- the labels of results and fields (`fd:`, `count:`), dim.
+
+A trace is mostly the same calls with the same arguments, so the most recent lines are cached.
 """
 import re
 from functools import lru_cache
 
-from pygments import highlight as pygments_highlight
-from pygments import lexers
-from pygments.formatters import TerminalTrueColorFormatter
-from pygments.token import Keyword, Name, Number, Operator, Punctuation, String, Whitespace
-
-c_lexer = lexers.CLexer()
-color_formatter = TerminalTrueColorFormatter(style='stata-dark')
+_RESET = '\x1b[0m'
+_BOLD = '\x1b[1m'
+_DIM = '\x1b[2m'
+_RED = '\x1b[31m'
+_GREEN = '\x1b[32m'
+_YELLOW = '\x1b[33m'
+_CYAN = '\x1b[36m'
 
-# pygments.lexers.c_cpp.CFamilyLexer's 'keywords', 'types' and builtins, the names it does not lex as `Name`.
-_KEYWORDS = {
-    'asm', 'auto', 'break', 'const', 'constexpr', 'continue', 'countof', 'default', 'defer', 'do', 'else', 'enum',
-    'extern', 'for', 'goto', 'if', 'register', 'restricted', 'return', 'sizeof', 'static', 'switch', 'typedef',
-    'typeof', 'typeof_unqual', 'volatile', 'while', 'thread_local', 'alignas', 'alignof', 'static_assert', '_Pragma',
-    'fortran',
-}
-_RESERVED = {'inline', '_inline', '__inline', 'naked', 'restrict', 'thread', '__int8', '__int16', '__int32',
-             '__int64', '__wchar_t', '__m128i', '__m128d', '__m128', '__m64'} | {
-    '__' + name for name in ('asm', 'based', 'except', 'stdcall', 'cdecl', 'fastcall', 'declspec', 'finally', 'try',
-                             'leave', 'w64', 'unaligned', 'raise', 'noop', 'identifier', 'forceinline', 'assume',
-                             'null')}
-_TYPES = {'bool', 'int', 'long', 'float', 'short', 'double', 'char', 'unsigned', 'signed', 'void', '_BitInt',
-          '__int128'}
-_BUILTINS = {'true', 'false', 'NULL', 'nullptr'}
-# Names that start another lexer state, or a string with an affix (`L"..."`): left to pygments.
-_STATEFUL = {'struct', 'union', 'case', 'L', 'u', 'U', 'u8'}
-
-_INT_SUFFIX = r'(?:[uU][lL]{0,2}|[lL]{1,2}[uU]?)?'
-_DEC = r'\d(?:\'?\d)*'
-_HEX = r'[0-9a-fA-F](?:\'?[0-9a-fA-F])*'
-# The alternatives are tried in the lexer's order at each token start. `unsupported` marks what pygments lexes
-# differently from this tokenizer (comments and floating-point numbers); characters no alternative matches (`'`, `\\`,
-# `#`, `$`, a string with an escape, ...) also send the line to pygments.
 _TOKEN = re.compile(
-    r'(?P<unsupported>/[/*]'
-    r'|0[xX](?:' + _HEX + r'\.' + _HEX + r'|\.' + _HEX + r'|' + _HEX + r')[pP]'
-    r'|-?(?:' + _DEC + r'\.' + _DEC + r'|\.' + _DEC + r'|' + _DEC + r')[eE][+-]?' + _DEC +
-    r'|-?(?:' + _DEC + r'\.|\.' + _DEC + r'|' + _DEC + r'[fFlL])'
-    r')'
-    r'|(?P<string>")(?P<content>[^\\"\n]*)(?P<close>")'
-    r'|(?P<hex>-?0[xX]' + _HEX + _INT_SUFFIX + r')'
-    r'|(?P<bin>-?0[bB][01](?:\'?[01])*' + _INT_SUFFIX + r')'
-    r'|(?P<oct>-?0(?:\'?[0-7])+' + _INT_SUFFIX + r')'
-    r'|(?P<int>-?' + _DEC + _INT_SUFFIX + r')'
-    r'|(?P<op>[~!%^&*+=|?:<>/-])'
-    r'|(?P<punct>[()\[\],.])'
-    r'|(?P<name>[a-zA-Z_]\w*)'
-    r'|(?P<ws>[^\S\n]+)'
+    r'(?P<string>"[^"]*")'
+    r'|(?P<number>-?0[xX][0-9a-fA-F]+|-?\d+)'
+    r'|(?P<label>[A-Za-z_][\w ]*?:)(?= |$)'
+    r'|(?P<name>[A-Za-z_]\w*)'
 )
-# Whole-line rules of the lexer: a label at the start of a line, and functions (their rules need a `;` or `{`).
-_UNSUPPORTED = re.compile(r'^\s*[a-zA-Z_$]\w*\s*:(?!:)|[;{]')
-
-
-def _style(ttype):
-    # The formatter uses the style of the token type, or of its closest parent that has one.
-    while str(ttype) not in color_formatter.style_string and ttype.parent is not None:
-        ttype = ttype.parent
-    return color_formatter.style_string.get(str(ttype), ('', ''))
+# A constant is all capitals, digits and underscores, with at least one capital.
+_CONSTANT = re.compile(r'[A-Z][A-Z0-9_]*')
+# `KERN_SUCCESS` is a result, not an error.
+_SUCCESS = {'KERN_SUCCESS'}
 
 
-_GROUPS = {'hex': _style(Number.Hex), 'bin': _style(Number.Bin), 'oct': _style(Number.Oct),
-           'int': _style(Number.Integer), 'op': _style(Operator), 'punct': _style(Punctuation)}
-_NAME_STYLES = {}
-for _names, _ttype in ((_KEYWORDS, Keyword), (_RESERVED, Keyword.Reserved), (_TYPES, Keyword.Type),
-                       (_BUILTINS, Name.Builtin)):
-    for _name in _names:
-        _NAME_STYLES[_name] = _style(_ttype)
-_NAME = _style(Name)
-_STRING = _style(String)
-# Whitespace only gets a foreground color, which a space does not show: it can stay in the style before it.
-_FG_RESET = '\x1b[39m'
-assert _style(Whitespace)[1] == _FG_RESET
-
-
-def _pygments(text: str) -> str:
-    return pygments_highlight(text, c_lexer, color_formatter).strip()
-
-
-# Traces repeat (the same calls with the same arguments): in a busy `--bsc` trace, 77% of the lines were among the
-# 16k most recent ones.
 @lru_cache(maxsize=1 << 14)
 def highlight(text: str) -> str:
-    """`text` colored as `pygments.highlight(text, CLexer(), TerminalTrueColorFormatter('stata-dark'))` shows it.
-
-    pygments starts and ends the escape sequence of every token, even between tokens of the same color, and colors
-    spaces. Here a sequence starts only where the color changes, which renders the same in about half the bytes (the
-    terminal is the bottleneck of a busy trace).
-    """
-    if _UNSUPPORTED.search(text):
-        return _pygments(text)
+    """`text` with terminal colors (SGR escape sequences); the text itself is unchanged."""
     out = []
-    style = None  # the (on, off) in effect
     pos = 0
+    error = False  # inside the value of an `errno:` result
+    first = True
     for match in _TOKEN.finditer(text):
-        if match.start() != pos:
-            return _pygments(text)
+        if match.start() > pos:
+            out.append(text[pos:match.start()])
         pos = match.end()
         kind = match.lastgroup
-        if kind == 'ws':
-            out.append(match.group())
-            continue
-        if kind == 'unsupported':
-            return _pygments(text)
-        if kind == 'close':
-            token_style = _STRING
-        elif kind == 'name':
-            name = match.group()
-            if name in _STATEFUL:
-                return _pygments(text)
-            token_style = _NAME_STYLES.get(name, _NAME)
+        value = match.group()
+        if kind == 'string':
+            out.append(_GREEN + value + _RESET)
+        elif kind == 'number':
+            out.append((_RED if error else _CYAN) + value + _RESET)
+        elif kind == 'label':
+            error = value == 'errno:'
+            out.append((_RED if error else _DIM) + value + _RESET)
+        elif first:
+            out.append(_BOLD + value + _RESET)
+        elif _CONSTANT.fullmatch(value):
+            failed = error or (value.startswith('KERN_') and value not in _SUCCESS)
+            out.append((_RED if failed else _YELLOW) + value + _RESET)
         else:
-            token_style = _GROUPS[kind]
-        if style is None or token_style[0] != style[0]:
-            # Ending a foreground color is not needed when the next one replaces it.
-            if style is not None and style[1] != _FG_RESET:
-                out.append(style[1])
-            out.append(token_style[0])
-            style = token_style
-        out.append(match.group())
-    if pos != len(text):
-        return _pygments(text)
-    if style is not None:
-        out.append(style[1])
-    return ''.join(out).strip()
+            out.append(value)
+        first = False
+    out.append(text[pos:])
+    return ''.join(out)

pykdebugparser/pykdebugparser.py

@@ -1,4 +1,6 @@
+import dataclasses
 from datetime import datetime
+from enum import Enum
 import io
 import math
 
@@ -9,6 +11,7 @@ from pykdebugparser.highlight import highlight
 from pykdebugparser.kd_buf_parser import KdBufParser
 from pykdebugparser.kevent import DgbFuncQual
 from pykdebugparser.trace_codes import default_trace_codes
+from pykdebugparser.trace_handlers import UnknownEnumValue
 from pykdebugparser.trace_handlers.trace import TRACE_LOST_EVENTS
 from pykdebugparser.traces_parser import TracesParser
 from pykdebugparser.os_log_event import OsLogEvent
@@ -19,6 +22,32 @@ DBG_FSYSTEM = 3
 DBG_BSD = 4
 
 
+def _fields(trace) -> dict:
+    """A trace's parsed values (its dataclass fields but the raw kevents), as JSON-compatible values."""
+    return {field.name: _jsonable(getattr(trace, field.name)) for field in dataclasses.fields(trace)
+            if field.name != 'ktraces'}
+
+
+def _jsonable(value):
+    if isinstance(value, (bool, str)) or value is None:
+        return value
+    if isinstance(value, UnknownEnumValue):
+        return int(value)
+    if isinstance(value, Enum):
+        return value.name
+    if isinstance(value, (int, float)):
+        return value
+    if isinstance(value, (bytes, bytearray)):
+        return value.hex()
+    if isinstance(value, (list, tuple)):
+        return [_jsonable(item) for item in value]
+    if isinstance(value, dict):
+        return {str(key): _jsonable(item) for key, item in value.items()}
+    if dataclasses.is_dataclass(value) and not isinstance(value, type):
+        return _fields(value)
+    return str(value)
+
+
 class PyKdebugParser:
     def __init__(self):
         self.filter_tid = None
@@ -99,6 +128,32 @@ class PyKdebugParser:
             trace_generator = filter(lambda t: t.ktraces[0].eventid >> 24 != DBG_FSYSTEM, trace_generator)
         return trace_generator
 
+    def dict_traces(self, kdebug: io.IOBase, trace_codes=None):
+        """The traces as JSON-compatible dicts (see `trace_dict`)."""
+        trace_codes_map = default_trace_codes() if trace_codes is None else trace_codes
+        return map(lambda t: self.trace_dict(t, trace_codes_map), self.traces(kdebug, trace_codes_map))
+
+    def trace_dict(self, trace, trace_codes=None) -> dict:
+        """
+        A trace as JSON-compatible data: when (`timestamp` in mach ticks, and `time` in ISO 8601 when the device's time
+        information is set), where (`tid`, `pid`, `process`), what (`event`, the trace code name of its first kevent,
+        and `fields`, the parsed values) and `text`, as `formatted_traces` prints it.
+        """
+        trace_codes_map = default_trace_codes() if trace_codes is None else trace_codes
+        first = trace.ktraces[0]
+        pid = self.threads_pids.get(first.tid)
+        posix_time = self._posix_time(first.timestamp)
+        return {
+            'timestamp': first.timestamp,
+            'time': None if posix_time is None else datetime.fromtimestamp(posix_time, tz=self.timezone).isoformat(),
+            'tid': first.tid,
+            'pid': pid,
+            'process': self.pids_names.get(pid, '') if pid is not None else '',
+            'event': trace_codes_map.get(first.eventid, hex(first.eventid)),
+            'fields': _fields(trace),
+            'text': str(trace),
+        }
+
     def formatted_traces(self, kdebug: io.IOBase, trace_codes=None):
         return map(lambda t: self._format_trace(t), self.traces(kdebug, trace_codes))
 
@@ -128,13 +183,19 @@ class PyKdebugParser:
         process_name = self.pids_names.get(pid, '')
         return self.filter_process == str(pid) or self.filter_process == process_name
 
-    def _format_timestamp(self, timestamp):
+    def _posix_time(self, timestamp):
+        """A kevent timestamp (mach ticks) as POSIX time, or None without the device's time information."""
         if None in (self.mach_absolute_time, self.numer, self.denom, self.usecs_since_epoch, self.timezone):
-            return str(timestamp) + ' '
+            return None
         offset_usec = (
                 ((timestamp - self.mach_absolute_time) * self.numer) / (self.denom * 1000)
         )
-        posix_time = (self.usecs_since_epoch + offset_usec) / 1000000
+        return (self.usecs_since_epoch + offset_usec) / 1000000
+
+    def _format_timestamp(self, timestamp):
+        posix_time = self._posix_time(timestamp)
+        if posix_time is None:
+            return str(timestamp) + ' '
         # Split to seconds and microseconds exactly like `datetime.fromtimestamp` does (round half to even), so
         # the date and time part can be formatted only once per second.
         fraction, seconds = math.modf(posix_time)

pykdebugparser/trace_handlers/bsd.py

@@ -2837,13 +2837,22 @@ DARWIN_SIGNALS = (None, 'SIGHUP', 'SIGINT', 'SIGQUIT', 'SIGILL', 'SIGTRAP', 'SIG
                   'SIGWINCH', 'SIGINFO', 'SIGUSR1', 'SIGUSR2')
 
 
+def pid(value: int) -> int:
+    """A `pid_t` argument: a C int, where -1 means any and a negative pid a process group (`kill(-pgid, sig)`)."""
+    return ctypes.c_int32(value).value
+
+
+def signal_name(sig: int) -> str:
+    """A Darwin signal by name (`SIGTERM`), or its number (0 only checks that the target exists)."""
+    return DARWIN_SIGNALS[sig] if 0 < sig < len(DARWIN_SIGNALS) else str(sig)
+
+
 def format_wait_status(status: int) -> str:
     """Describe a wait status (`W_EXITCODE(code, signal)`) as its exit code or terminating signal."""
     signal = status & 0x7f
     if not signal:
         return f'exit code: {(status >> 8) & 0xff}'
-    name = DARWIN_SIGNALS[signal] if signal < len(DARWIN_SIGNALS) else str(signal)
-    return f'signal: {name}' + (', core dumped' if status & 0x80 else '')
+    return f'signal: {signal_name(signal)}' + (', core dumped' if status & 0x80 else '')
 
 
 @dataclass
@@ -3034,7 +3043,7 @@ class BscPthreadKill:
     result: str
 
     def __str__(self):
-        rep = f'pthread_kill({self.thread_port}, {self.sig})'
+        rep = f'pthread_kill({self.thread_port}, {signal_name(self.sig)})'
         if self.result:
             rep += f', {self.result}'
         return rep
@@ -3063,7 +3072,7 @@ class BscKill:
     result: str
 
     def __str__(self):
-        rep = f'kill({self.pid}, {self.sig})'
+        rep = f'kill({self.pid}, {signal_name(self.sig)})'
         if self.result:
             rep += f', {self.result}'
         return rep
@@ -3991,7 +4000,7 @@ class BscObsKillpg:
     result: str
 
     def __str__(self):
-        rep = f'killpg({self.pgrp}, {self.sig})'
+        rep = f'killpg({self.pgrp}, {signal_name(self.sig)})'
         if self.result:
             rep += f', {self.result}'
         return rep
@@ -5485,7 +5494,7 @@ def handle_bsdthread_terminate(parser, events):
 
 def handle_wait4(parser, events, no_cancel=False):
     args = events[0].values
-    return BscWait4(events, args[0], args[1], args[2], args[3], serialize_result(events[-1], 'pid'), no_cancel)
+    return BscWait4(events, pid(args[0]), args[1], args[2], args[3], serialize_result(events[-1], 'pid'), no_cancel)
 
 
 def handle_recvmsg(parser, events, no_cancel=False):
@@ -5548,7 +5557,7 @@ def handle_sigreturn(parser, events):
 
 
 def handle_kill(parser, events):
-    return BscKill(events, events[0].values[0], events[0].values[1], serialize_result(events[-1]))
+    return BscKill(events, pid(events[0].values[0]), events[0].values[1], serialize_result(events[-1]))
 
 
 def handle_getppid(parser, events):
@@ -5688,7 +5697,7 @@ def handle_getpgrp(parser, events):
 
 
 def handle_setpgid(parser, events):
-    return BscSetpgid(events, events[0].values[0], events[0].values[1], serialize_result(events[-1]))
+    return BscSetpgid(events, pid(events[0].values[0]), pid(events[0].values[1]), serialize_result(events[-1]))
 
 
 def handle_setitimer(parser, events):
@@ -5885,7 +5894,7 @@ def handle_gethostuuid(parser, events):
 
 
 def handle_obs_killpg(parser, events):
-    return BscObsKillpg(events, events[0].values[0], events[0].values[1], serialize_result(events[-1]))
+    return BscObsKillpg(events, pid(events[0].values[0]), events[0].values[1], serialize_result(events[-1]))
 
 
 def handle_setsid(parser, events):
@@ -5893,7 +5902,7 @@ def handle_setsid(parser, events):
 
 
 def handle_getpgid(parser, events):
-    return BscGetpgid(events, events[0].values[0], serialize_result(events[-1], 'gid'))
+    return BscGetpgid(events, pid(events[0].values[0]), serialize_result(events[-1], 'gid'))
 
 
 def handle_setprivexec(parser, events):
@@ -5952,12 +5961,12 @@ def handle_mount(parser, events):
 
 def handle_csops(parser, events):
     args = events[0].values
-    return BscCsops(events, args[0], parse_enum(CsopsOps, args[1]), args[2], args[3], serialize_result(events[-1]))
+    return BscCsops(events, pid(args[0]), parse_enum(CsopsOps, args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_csops_audittoken(parser, events):
     args = events[0].values
-    return BscCsopsAudittoken(events, args[0], parse_enum(CsopsOps, args[1]), args[2], args[3], serialize_result(events[-1]))
+    return BscCsopsAudittoken(events, pid(args[0]), parse_enum(CsopsOps, args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_waitid(parser, events, no_cancel=False):
@@ -6353,7 +6362,7 @@ def handle_psynch_cvwait(parser, events):
 
 def handle_getsid(parser, events):
     args = events[0].values
-    return BscGetsid(events, args[0], serialize_result(events[-1], 'sid'))
+    return BscGetsid(events, pid(args[0]), serialize_result(events[-1], 'sid'))
 
 
 def handle_psynch_cvclrprepost(parser, events):
@@ -6399,7 +6408,7 @@ def handle_semwait_signal(parser, events, no_cancel=False):
 
 def handle_proc_info(parser, events):
     args = events[0].values
-    return BscProcInfo(events, parse_enum(ProcInfoCall, args[0]), args[1], args[2], args[3], serialize_result(events[-1]))
+    return BscProcInfo(events, parse_enum(ProcInfoCall, args[0]), pid(args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_sendfile(parser, events):
@@ -6548,22 +6557,22 @@ def handle_audit_session_port(parser, events):
 
 def handle_pid_suspend(parser, events):
     args = events[0].values
-    return BscPidSuspend(events, args[0], serialize_result(events[-1]))
+    return BscPidSuspend(events, pid(args[0]), serialize_result(events[-1]))
 
 
 def handle_pid_resume(parser, events):
     args = events[0].values
-    return BscPidResume(events, args[0], serialize_result(events[-1]))
+    return BscPidResume(events, pid(args[0]), serialize_result(events[-1]))
 
 
 def handle_pid_hibernate(parser, events):
     args = events[0].values
-    return BscPidHibernate(events, args[0], serialize_result(events[-1]))
+    return BscPidHibernate(events, pid(args[0]), serialize_result(events[-1]))
 
 
 def handle_pid_shutdown_sockets(parser, events):
     args = events[0].values
-    return BscPidShutdownSockets(events, args[0], args[1], serialize_result(events[-1]))
+    return BscPidShutdownSockets(events, pid(args[0]), args[1], serialize_result(events[-1]))
 
 
 def handle_shared_region_map_and_slide_np(parser, events):
@@ -6578,7 +6587,7 @@ def handle_kas_info(parser, events):
 
 def handle_memorystatus_control(parser, events):
     args = events[0].values
-    return BscMemorystatusControl(events, args[0], args[1], args[2], args[3], serialize_result(events[-1]))
+    return BscMemorystatusControl(events, args[0], pid(args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_guarded_open_np(parser, events):
@@ -6609,7 +6618,7 @@ def handle_usrctl(parser, events):
 
 def handle_proc_rlimit_control(parser, events):
     args = events[0].values
-    return BscProcRlimitControl(events, args[0], args[1], args[2], serialize_result(events[-1]))
+    return BscProcRlimitControl(events, pid(args[0]), args[1], args[2], serialize_result(events[-1]))
 
 
 def handle_connectx(parser, events):
@@ -6663,7 +6672,7 @@ def handle_sfi_ctl(parser, events):
 
 def handle_sfi_pidctl(parser, events):
     args = events[0].values
-    return BscSfiPidctl(events, args[0], args[1], args[2], args[3], serialize_result(events[-1]))
+    return BscSfiPidctl(events, args[0], pid(args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_coalition(parser, events):
@@ -6778,7 +6787,7 @@ def handle_getattrlistat(parser, events):
 
 def handle_proc_trace_log(parser, events):
     args = events[0].values
-    return BscProcTraceLog(events, args[0], args[1], serialize_result(events[-1]))
+    return BscProcTraceLog(events, pid(args[0]), args[1], serialize_result(events[-1]))
 
 
 def handle_bsdthread_ctl(parser, events):
@@ -6979,7 +6988,7 @@ def handle_fs_snapshot(parser, events):
 
 def handle_terminate_with_payload(parser, events):
     args = events[0].values
-    return BscTerminateWithPayload(events, args[0], args[1], args[2], args[3], serialize_result(events[-1]))
+    return BscTerminateWithPayload(events, pid(args[0]), args[1], args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_abort_with_payload(parser, events):
@@ -7065,12 +7074,12 @@ def handle_pivot_root(parser, events):
 
 def handle_task_inspect_for_pid(parser, events):
     args = events[0].values
-    return BscTaskInspectForPid(events, args[0], args[1], args[2], serialize_result(events[-1]))
+    return BscTaskInspectForPid(events, args[0], pid(args[1]), args[2], serialize_result(events[-1]))
 
 
 def handle_task_read_for_pid(parser, events):
     args = events[0].values
-    return BscTaskReadForPid(events, args[0], args[1], args[2], serialize_result(events[-1]))
+    return BscTaskReadForPid(events, args[0], pid(args[1]), args[2], serialize_result(events[-1]))
 
 
 def handle_sys_preadv(parser, events, no_cancel=False):
@@ -7092,7 +7101,7 @@ def handle_ulock_wait2(parser, events):
 
 def handle_proc_info_extended_id(parser, events):
     args = events[0].values
-    return BscProcInfoExtendedId(events, args[0], args[1], args[2], args[3], serialize_result(events[-1]))
+    return BscProcInfoExtendedId(events, args[0], pid(args[1]), args[2], args[3], serialize_result(events[-1]))
 
 
 def handle_openat_dprotected_np(parser, events):

{pykdebugparser-1.5.0.dist-info → pykdebugparser-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pykdebugparser
-Version: 1.5.0
+Version: 1.6.1
 Summary: Python parser for kdebug events
 Author: Matan Perelman
 Author-email: matan1008@gmail.com
@@ -39,7 +39,6 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: bytestruct>=0.1.0
-Requires-Dist: pygments
 Requires-Dist: click
 Requires-Dist: termcolor
 Provides-Extra: testing

{pykdebugparser-1.5.0.dist-info → pykdebugparser-1.6.1.dist-info}/RECORD

@@ -1,25 +1,25 @@
 pykdebugparser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pykdebugparser/__main__.py,sha256=WfgLv5SGr0hQlUeM68ai1g0AqtYDgDFqYlbvvm5rua4,3711
 pykdebugparser/callstacks_parser.py,sha256=i2nfhx0olZZ65UV_ZV3Tw9E_6SWtre8CAbfRBSig4-E,1654
-pykdebugparser/highlight.py,sha256=i-mjfyak0VTo8P_7EeZLIUsUH08Qs-1yAjHBJVWW448,6439
+pykdebugparser/highlight.py,sha256=LqIf0kn8va0aE6tVGJyzu0MRnsR8o4OEJsYaUPXjDjM,2270
 pykdebugparser/kd_buf_parser.py,sha256=CpifFeBnQ_MZSokjO44lzhXO-KNnZvO-teaPyQqSfio,10991
 pykdebugparser/kevent.py,sha256=DudovIuES4QGxosYeEFJm3AW_FWGbJJBH1kcLnL7UFM,1779
 pykdebugparser/os_log_event.py,sha256=OQUlHpS44oUNwma_bxvnK0SKh_RFeEUdH1RmyrM4nLc,12356
-pykdebugparser/pykdebugparser.py,sha256=RipUcCh6dChgtdh_owvlprjLRMF1dvgic6ZyCqC5I8I,10320
+pykdebugparser/pykdebugparser.py,sha256=sx77jkvXEyEpmoW3XjANjTUZbm3BaOqRJjbQhIZxVxU,13052
 pykdebugparser/trace.codes,sha256=S6ZN5l9FSGrlSon8nKoVaqRfLdCPl3HL93XSjuoCUnM,103995
 pykdebugparser/trace_codes.py,sha256=4ImGc_jNpY-12cGXdwy6NMCEYcI24oYn1NBOaKNdWNo,1984
 pykdebugparser/traces_parser.py,sha256=LyHVTi4P2OeOLNG2Tahu1x7roQXkC-Jx8LS-E4mBcAQ,5799
 pykdebugparser/trace_handlers/__init__.py,sha256=r1dzmNTxiEtgENq9WFRVQX0g9f9dRxgAgVxjDXSc7s4,679
-pykdebugparser/trace_handlers/bsd.py,sha256=XJjKxDzHSD2VkwEPOqizdTA6ZydFXq7piEVJKCAa0ZY,189267
+pykdebugparser/trace_handlers/bsd.py,sha256=zk0FrMK1wlt-RKe8JBXNe1AvCryRRKgxDZQKVKToYF4,189747
 pykdebugparser/trace_handlers/dyld.py,sha256=LDgWzOl90qXzcc_q8OvttV2gJ4JNodXFwMemSiV8_ps,10154
 pykdebugparser/trace_handlers/fsystem.py,sha256=AE9L_00-11VyZAYd6dzkmTCP6EVFmXzyae2VikrsiJo,2082
 pykdebugparser/trace_handlers/mach.py,sha256=_2YEgUfKYxaB7NfA2jCVxUbdKDrU21KJKhxtc5yP1M8,39172
 pykdebugparser/trace_handlers/perf.py,sha256=CBffheZFlHa9IOVUZ-UcjNtKmjamv-un44bRJYYo9dw,5070
 pykdebugparser/trace_handlers/trace.py,sha256=s3Kr0wDvWZL2JZVKhxcvA1uvqsdePlEWiXfqSI76znw,5797
 pykdebugparser/trace_handlers/turnstile.py,sha256=8zZfba2Obq7a6qdhLIkItmZxRzzOe1PTTeHnrLuJUx0,8233
-pykdebugparser-1.5.0.dist-info/licenses/LICENSE,sha256=KjZXYP_CGYzDTtVfcxPT6wlGRoQKHPSJu0vh55_2QSo,1071
-pykdebugparser-1.5.0.dist-info/METADATA,sha256=biG_5LGv2RvIABkToh09hXR3eQ8Pm6BUlsI59SZPvdA,18995
-pykdebugparser-1.5.0.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
-pykdebugparser-1.5.0.dist-info/entry_points.txt,sha256=NrVIOgPR6v2MbpTZ3aKedP1jQ93nUQus6sgP4wAD0_E,63
-pykdebugparser-1.5.0.dist-info/top_level.txt,sha256=FcHHXR9VKmqufFw0a6UP4c8NyS-u4ORY-yXQ6ZzP_28,15
-pykdebugparser-1.5.0.dist-info/RECORD,,
+pykdebugparser-1.6.1.dist-info/licenses/LICENSE,sha256=KjZXYP_CGYzDTtVfcxPT6wlGRoQKHPSJu0vh55_2QSo,1071
+pykdebugparser-1.6.1.dist-info/METADATA,sha256=n7hDM3O4h_xlitu_hp8qjHKJ984Hpf1pTHTaRaxnuOo,18971
+pykdebugparser-1.6.1.dist-info/WHEEL,sha256=4YBfCYNH4wlLpv3pzq1hbEuIlXA4WJabKLFurZ7eTL0,109
+pykdebugparser-1.6.1.dist-info/entry_points.txt,sha256=NrVIOgPR6v2MbpTZ3aKedP1jQ93nUQus6sgP4wAD0_E,63
+pykdebugparser-1.6.1.dist-info/top_level.txt,sha256=FcHHXR9VKmqufFw0a6UP4c8NyS-u4ORY-yXQ6ZzP_28,15
+pykdebugparser-1.6.1.dist-info/RECORD,,