Include rpm2cpio (decompression and extraction) in --time-report.

rpmlint/lint.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 import cProfile
 import importlib
 import operator
@@ -25,7 +26,7 @@ class Lint(object):
         self.options = options
         self.packages_checked = 0
         self.specfiles_checked = 0
-        self.check_duration = {}
+        self.check_duration = defaultdict(lambda: 0)
         if options['config']:
             self.config = Config(options['config'])
         else:
@@ -132,9 +133,12 @@ class Lint(object):
             fraction = 100.0 * duration / total
             if fraction < THRESHOLD:
                 continue
-            checked_files = self.checks[check].checked_files
-            if not checked_files:
-                checked_files = ''
+
+            checked_files = ''
+            if check in self.checks:
+                checked = self.checks[check].checked_files
+                if checked:
+                    checked_files = checked
             print(f'    {check:32s} {duration:15.1f} {self._get_color_time_report_value(fraction)} {checked_files:>14}')
         print(f'    {"TOTAL":32s} {total:15.1f} {100:17.1f} {total_checked_files:>14}')
 
@@ -250,6 +254,7 @@ class Lint(object):
             if pname.suffix == '.rpm' or pname.suffix == '.spm':
                 with Pkg(pname, self.config.configuration['ExtractDir'],
                          verbose=self.config.info) as pkg:
+                    self.check_duration['rpm2cpio'] += pkg.extraction_time
                     self.run_checks(pkg, is_last)
             elif pname.suffix == '.spec':
                 with FakePkg(pname) as pkg:
@@ -264,8 +269,6 @@ class Lint(object):
     def run_checks(self, pkg, is_last):
         spec_checks = isinstance(pkg, FakePkg)
         for checker in self.checks:
-            if checker not in self.check_duration:
-                self.check_duration[checker] = 0
             start = time.monotonic()
             fn = self.checks[checker].check_spec if spec_checks else self.checks[checker].check
             fn(pkg)

rpmlint/pkg.py

@@ -9,6 +9,7 @@ from shlex import quote
 import stat
 import subprocess
 import tempfile
+import time
 from urllib.parse import urljoin
 
 try:
@@ -398,7 +399,11 @@ class Pkg(AbstractPkg):
     def __init__(self, filename, dirname, header=None, is_source=False, extracted=False, verbose=False):
         self.filename = filename
         self.extracted = extracted
+
+        # record decompression and extraction time
+        start = time.monotonic()
         self.dirname = self.dir_name(dirname, verbose)
+        self.extraction_time = time.monotonic() - start
         self.current_linenum = None
 
         self._req_names = -1