]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: Optimise SSTATE_EXCLUDEDEPS_SYSROOT handling
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 15 Aug 2018 14:30:07 +0000 (14:30 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 16 Aug 2018 08:49:32 +0000 (09:49 +0100)
Using re.compile() is around six times faster than recompiling the regexp
each time so maintain a cache.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 6f2fa583f29feaa245b16a879c3904496a5e7e05..c0e54a398d6f85f3d3d30f537a1d5cf0de899f75 100644 (file)
@@ -980,9 +980,16 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None):
             # them in.
             # See also http://lists.openembedded.org/pipermail/openembedded-core/2018-January/146324.html
             not_needed = False
-            for excl in (d.getVar('SSTATE_EXCLUDEDEPS_SYSROOT') or "").split():
-                if re.match(excl.split('->', 1)[0], taskdependees[dep][0]):
-                    if re.match(excl.split('->', 1)[1], taskdependees[task][0]):
+            excludedeps = d.getVar('_SSTATE_EXCLUDEDEPS_SYSROOT')
+            if excludedeps is None:
+                # Cache the regular expressions for speed
+                excludedeps = []
+                for excl in (d.getVar('SSTATE_EXCLUDEDEPS_SYSROOT') or "").split():
+                    excludedeps.append((re.compile(excl.split('->', 1)[0]), re.compile(excl.split('->', 1)[1])))
+                d.setVar('_SSTATE_EXCLUDEDEPS_SYSROOT', excludedeps)
+            for excl in excludedeps:
+                if excl[0].match(taskdependees[dep][0]):
+                    if excl[1].match(taskdependees[task][0]):
                         not_needed = True
                         break
             if not_needed: