From e011e92e8c7a3acf853333e77ba8d005e1a9b417 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Feb 2015 17:41:41 +0000 Subject: lib/oe/package_manager: Performance tweak in regex usage Profiling a core-image-sato-sdk rootfs, we're spending over 40s compiling the same regex over and over again, roughly around 5 million times. This is suboptimal, fix for a 40s improvement on a 18.5minute task execution time. (From OE-Core rev: d0244702752f54fb74be427af1663e46bfff9a5d) Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe/package_manager.py') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f801333e54..69bef1dfbc 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -679,10 +679,10 @@ class RpmPM(PackageManager): def _search_pkg_name_in_feeds(self, pkg, feed_archs): for arch in feed_archs: arch = arch.replace('-', '_') + regex_match = re.compile(r"^%s-[^-]*-[^-]*@%s$" % \ + (re.escape(pkg), re.escape(arch))) for p in self.fullpkglist: - regex_match = r"^%s-[^-]*-[^-]*@%s$" % \ - (re.escape(pkg), re.escape(arch)) - if re.match(regex_match, p) is not None: + if regex_match.match(p) is not None: # First found is best match # bb.note('%s -> %s' % (pkg, pkg + '@' + arch)) return pkg + '@' + arch -- cgit v1.2.3-54-g00ecf