diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-20 17:41:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-21 22:05:36 +0000 |
commit | e011e92e8c7a3acf853333e77ba8d005e1a9b417 (patch) | |
tree | 0796d5018a8c33724ccc9c67eeb2cb127acadfd2 /meta/lib | |
parent | efa7c29a12bca5f763d01d7452add371faf11251 (diff) | |
download | ast2050-yocto-poky-e011e92e8c7a3acf853333e77ba8d005e1a9b417.zip ast2050-yocto-poky-e011e92e8c7a3acf853333e77ba8d005e1a9b417.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/package_manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index f801333..69bef1d 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 |