Re: [PATCH v3, 1/2] lib/oe/sdk: Add get_extra_sdk_info to reuse code in buildhistory

[Joshua Lock <joshua.g.lock@linux.intel.com>]

On Tue, 2017-03-28 at 00:15 -0700, Francisco Pedraza wrote:
> This function is going to be used for generating the target and host
> manifest files packages for eSDK.
> [YOCTO #9038]
> 
> Signed-off-by: Francisco Pedraza <francisco.j.pedraza.gonzalez@intel.
> com>
> ---
>  meta/classes/buildhistory.bbclass | 16 ++++------------
>  meta/lib/oe/sdk.py                | 16 ++++++++++++++++
>  2 files changed, 20 insertions(+), 12 deletions(-)
> 
> diff --git a/meta/classes/buildhistory.bbclass
> b/meta/classes/buildhistory.bbclass
> index 109b375..ab04db7 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -554,25 +554,17 @@ END
>  python buildhistory_get_extra_sdkinfo() {
>      import operator
>      import math

I don't think we need to import math here anymore?

> +    # importing oe.sdk due package information req.

No need for this comment.

> +    from oe.sdk import get_extra_sdkinfo
>  
>      if d.getVar('BB_CURRENTTASK') == 'populate_sdk_ext' and \
>              "sdk" in (d.getVar('BUILDHISTORY_FEATURES') or
> "").split():
> -        tasksizes = {}
> -        filesizes = {}
> -        for root, _, files in
> os.walk(d.expand('${SDK_OUTPUT}/${SDKPATH}/sstate-cache')):
> -            for fn in files:
> -                if fn.endswith('.tgz'):
> -                    fsize =
> int(math.ceil(float(os.path.getsize(os.path.join(root, fn))) / 1024))
> -                    task = fn.rsplit(':', 1)[1].split('_',
> 1)[1].split('.')[0]
> -                    origtotal = tasksizes.get(task, 0)
> -                    tasksizes[task] = origtotal + fsize
> -                    filesizes[fn] = fsize
>          with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-package-
> sizes.txt'), 'w') as f:
> -            filesizes_sorted = sorted(filesizes.items(),
> key=operator.itemgetter(1, 0), reverse=True)
> +            filesizes_sorted =
> sorted(extra_info['filesizes'].items(), key=operator.itemgetter(1,
> 0), reverse=True)
>              for fn, size in filesizes_sorted:
>                  f.write('%10d KiB %s\n' % (size, fn))
>          with open(d.expand('${BUILDHISTORY_DIR_SDK}/sstate-task-
> sizes.txt'), 'w') as f:
> -            tasksizes_sorted = sorted(tasksizes.items(),
> key=operator.itemgetter(1, 0), reverse=True)
> +             tasksizes_sorted =
> sorted(extra_info['tasksizes'].items(), key=operator.itemgetter(1,
> 0), reverse=True)

It looks like the indentation changes here?

>              for task, size in tasksizes_sorted:
>                  f.write('%10d KiB %s\n' % (size, task))
>  }
> diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
> index deb823b..d101bf0 100644
> --- a/meta/lib/oe/sdk.py
> +++ b/meta/lib/oe/sdk.py
> @@ -372,5 +372,21 @@ def populate_sdk(d, manifest_dir=None):
>      os.environ.clear()
>      os.environ.update(env_bkp)
>  
> +def get_extra_sdk_info(sstate_dir):
> +    import operator

I don't think we need operator here?

A docstring for this function would be nice.

> +    import math
> +
> +    extra_info = {}
> +    extra_info['tasksizes']
> +    for root, _, files in os.walk(sstate_dir):
> +        for fn in files:
> +            if fn.endswith('.tgz'):
> +                fsize =
> int(math.ceil(float(os.path.getsize(os.path.join(root, fn))) / 1024))
> +                task =
> fn.rsplit(':',1)[1].split('_',1)[1].split(',')[0]
> +                origtotal = extra_info['tasksizes'].get(task, 0)
> +                extra_info['tasksizes'][task] = origtotal + fsize
> +                extra_info['filesizes'][fn] = fsize
> +    return extra_info 
> +
>  if __name__ == "__main__":
>      pass
> -- 
> 1.8.3.1
>