[PATCH] data: Move warning code to the first loop for performance

[PATCH] data: Move warning code to the first loop for performance

[Richard Purdie]

By doing this we can take advantage of the expansion cache before
starting write operations on the data store.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 82eefef..218998a 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -156,17 +156,17 @@ def expandKeys(alterdata, readdata = None):
         if key == ekey:
             continue
         todolist[key] = ekey
+        newval = alterdata.getVar(ekey, 0)
+        if newval:
+            val = alterdata.getVar(key, 0)
+            if val is not None and newval is not None:
+                bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
 
     # These two for loops are split for performance to maximise the
     # usefulness of the expand cache
 
     for key in todolist:
         ekey = todolist[key]
-        newval = alterdata.getVar(ekey, 0)
-        if newval:
-            val = alterdata.getVar(key, 0)
-            if val is not None and newval is not None:
-                bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
         alterdata.renameVar(key, ekey)
 
 def inheritFromOS(d, savedenv, permitted):

Re: [PATCH] data: Move warning code to the first loop for performance

[Bernhard Reutner-Fischer]

On May 25, 2015 9:53:52 AM GMT+02:00, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
>By doing this we can take advantage of the expansion cache before
>starting write operations on the data store.
>
>Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
>diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
>index 82eefef..218998a 100644
>--- a/bitbake/lib/bb/data.py
>+++ b/bitbake/lib/bb/data.py
>@@ -156,17 +156,17 @@ def expandKeys(alterdata, readdata = None):
>         if key == ekey:
>             continue
>         todolist[key] = ekey
>+        newval = alterdata.getVar(ekey, 0)
>+        if newval:
>+            val = alterdata.getVar(key, 0)
>+            if val is not None and newval is not None:

newval cannot ever be None in this if.

Thanks,
>+                bb.warn("Variable key %s (%s) replaces original key %s
>(%s)." % (key, val, ekey, newval))
> 
>     # These two for loops are split for performance to maximise the
>     # usefulness of the expand cache
> 
>     for key in todolist:
>         ekey = todolist[key]
>-        newval = alterdata.getVar(ekey, 0)
>-        if newval:
>-            val = alterdata.getVar(key, 0)
>-            if val is not None and newval is not None:
>-                bb.warn("Variable key %s (%s) replaces original key %s
>(%s)." % (key, val, ekey, newval))
>         alterdata.renameVar(key, ekey)
> 
> def inheritFromOS(d, savedenv, permitted):

Re: [PATCH] data: Move warning code to the first loop for performance

[Richard Purdie]

On Tue, 2015-05-26 at 11:56 +0200, Bernhard Reutner-Fischer wrote:
> On May 25, 2015 9:53:52 AM GMT+02:00, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
> >By doing this we can take advantage of the expansion cache before
> >starting write operations on the data store.
> >
> >Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> >
> >diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
> >index 82eefef..218998a 100644
> >--- a/bitbake/lib/bb/data.py
> >+++ b/bitbake/lib/bb/data.py
> >@@ -156,17 +156,17 @@ def expandKeys(alterdata, readdata = None):
> >         if key == ekey:
> >             continue
> >         todolist[key] = ekey
> >+        newval = alterdata.getVar(ekey, 0)
> >+        if newval:
> >+            val = alterdata.getVar(key, 0)
> >+            if val is not None and newval is not None:
> 
> newval cannot ever be None in this if.

True, to be fair I just moved the code although I probably was
responsible for the original too.

I'll tweak it, thanks.

Cheers,

Richard