From 27b53186fa67d281d29b2f8e15bcff8dc2557b8a Mon Sep 17 00:00:00 2001 From: Jean-Francois Dagenais Date: Wed, 23 Sep 2020 09:44:06 -0400 Subject: bitbake: siggen: clean_basepath: improve perfo and readability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change improves performance by reducing runtime about 33% for typical inputs. (using test_clean_basepath_performance) It is also easier to read, and slightly more resilient to future changes since it doesn't mention 'virtual' anymore. Signed-off-by: Jean-Francois Dagenais Co-Developed-by: Maxime Roussin-Bélanger Signed-off-by: Maxime Roussin-Bélanger Signed-off-by: Richard Purdie --- lib/bb/siggen.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index ad49d1e2a..1456324a7 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -746,16 +746,26 @@ def list_inline_diff(oldlist, newlist, colors=None): ret.append(item) return '[%s]' % (', '.join(ret)) -def clean_basepath(a): - mc = None - if a.startswith("mc:"): - _, mc, a = a.split(":", 2) - b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] - if a.startswith("virtual:"): - b = b + ":" + a.rsplit(":", 2)[0] - if mc: - b = b + ":mc:" + mc - return b +def clean_basepath(basepath): + basepath, dir, recipe_task = basepath.rsplit("/", 2) + cleaned = dir + '/' + recipe_task + + if basepath[0] == '/': + return cleaned + + if basepath.startswith("mc:"): + mc, mc_name, basepath = basepath.split(":", 2) + mc_suffix = ':mc:' + mc_name + else: + mc_suffix = '' + + # mc stuff now removed from basepath. Whatever was next, if present will be the first + # suffix. ':/', recipe path start, marks the end of this. Something like + # 'virtual:a[:b[:c]]:/path...' (b and c being optional) + if basepath[0] != '/': + cleaned += ':' + basepath.split(':/', 1)[0] + + return cleaned + mc_suffix def clean_basepaths(a): b = {} -- cgit 1.2.3-korg