uproctrace

@@ -24,7 +24,7 @@ from gi.repository import Gdk, Gtk, GLib

 GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit)

 # regular expression for an environment variable assignment

-re_env_var = re.compile(r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)=(?P<value>.*)$')

+RE_ENV_VAR = re.compile(r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)=(?P<value>.*)$')

 def add_none(val_a: int, val_b: int) -> int:

@@ -45,19 +45,19 @@ def cmdline2str(cmdline: list) -> str:

     return ' '.join([cmdline_str_escape(s) for s in cmdline])

-def cmdline_str_escape(s: str) -> str:

+def cmdline_str_escape(string: str) -> str:

     """

     Escape a command line string for shell use in a way that also works for

     environment variables (i.e., not escaping the variable name).

     """

-    m = re_env_var.match(s)

-    if not m:

+    match = RE_ENV_VAR.match(string)

+    if not match:

         # not a variable assignment -> escape entire string

-        return shlex.quote(s)

+        return shlex.quote(string)

     # variable assignment -> escape only value part

     # (also works if it only looks like a variable assignment)

-    name = m.group('name')

-    value = shlex.quote(m.group('value'))

+    name = match.group('name')

+    value = shlex.quote(match.group('value'))

     return f'{name:s}={value:s}'

@@ -148,6 +148,8 @@ class UptGui:

     Graphical user interface of UProcTrace.

     """

+    # pylint: disable=R0902

+

     DETAIL_PROC_ID = 0

     DETAIL_KEY = 1

     DETAIL_VALUE = 2

@@ -280,6 +280,12 @@ class Processes(uproctrace.parse.Visitor):

         """

         return self._toplevel_processes.copy()

+    def getAllProcesses(self) -> dict:

+        """

+        Return all processes.

+        """

+        return self._all_processes.copy()

+

     def getProcess(self, proc_id: int):

         """

         Return process with proc_id, or None if not found.

@@ -34,13 +34,14 @@ def calculate_stats(upt_traces: list) -> dict:

     for upt_trace in upt_traces:

         # Load all processes of the trace file

-        with open(upt_trace, "rb") as f:

-            processes = uproctrace.processes.Processes(f)

+        with open(upt_trace, "rb") as upt_f:

+            processes = uproctrace.processes.Processes(upt_f)

-        for process in processes._all_processes.values():

+        for process in processes.getAllProcesses().values():

             # Ignore processes for which we do not have full information

-            if process._begin is None or process._end is None:

+            if process.getBeginTimestamp() is None or process.getEndTimestamp(

+            ) is None:

                 continue

             # Update the values

@@ -50,7 +51,7 @@ def calculate_stats(upt_traces: list) -> dict:

     # Calulate the statistics

     stats = dict()

     for attr, values in attr_values.items():

-        if len(values) == 0:

+        if not values:

             stats[attr] = (0, 0, 0, 0)

             continue

@@ -51,6 +51,7 @@ def gui(args):

         return 1

     import uproctrace.gui

     uproctrace.gui.run(args.trace[0])

+    return 0

 def pstree(args):