Fix targets py #2148

bogdanm · 2016-07-12T10:05:14Z

Fixes to caching function results in targets.py
Added the ability to use a different targets.json with targets.py

@cached

Now funnctions are looked up in the cache using a (function name, arguments) key, which makes it possible to cache different invocations of the functions (with different arguments). Also applied the @cached attribute to get_target.

With this change, it becomes possible to use targets.py with any targets.json, not just the default one in ../hal/targets.json. targets.py will still be initialized with the default targets.json, but the code can then call "set_targets_json_location" to specify the new location of targets.json. set_targets_json_location modifies all the data "in place"; that is, it doesn't create a new TARGET_MAP, TARGET_NAMES or alike, but rather modified the existing ones. This is important, because code using this construct: from tools.targets import TARGET_MAP can work unmodified with this change.

bogdanm · 2016-07-12T10:05:51Z

@screamerbg @theotherjimmy

0xc0170 · 2016-07-12T10:45:23Z

0.24s$ PYTHONPATH=. python tools/test/config_test/config_test.py
test01:'test single target inheritance'(d1) Traceback (most recent call last):
  File "tools/test/config_test/config_test.py", line 103, in <module>
    failed += test_tree(full_name, test_name)
  File "tools/test/config_test/config_test.py", line 46, in test_tree
    cfg, macros, features = get_config(full_name, target, "GCC_ARM")
  File "/home/travis/build/mbedmicro/mbed/tools/build_api.py", line 88, in get_config
    config = Config(target, src_paths)
  File "/home/travis/build/mbedmicro/mbed/tools/config.py", line 181, in __init__
    Target.add_py_targets(self.app_config_data.get("custom_targets", {}))
  File "/home/travis/build/mbedmicro/mbed/tools/targets.py", line 193, in add_py_targets
    old_target = Target.__target_map.get(tk, None)
AttributeError: class Target has no attribute '_Target__target_map'

Previously, add_py_targets assumed that it is not an error to add an existing target if that target was previously added using add_py_targets. This was done to aid testing, but it was weird, error prone and broke with the latest changes to the caching mechanism. With this commit: - it is always an error to add a target that was previously added, which is much more consistent. - tests for the configuration mechanism use the newly added 'set_targets_json_location' function to clear the internal caches in targets.py (and thus all previously added custom targets). As a side effect, this commit also tests the 'set_targets_json_location' function itself.

bogdanm · 2016-07-12T11:46:59Z

Thanks, @0xc0170! Fixed in the latest commit.

theotherjimmy · 2016-07-12T16:29:09Z

👍 thanks for the credit!

theotherjimmy and others added 2 commits July 12, 2016 13:03

Fixes to function caching in targets.py

50dbce9

Now funnctions are looked up in the cache using a (function name, arguments) key, which makes it possible to cache different invocations of the functions (with different arguments). Also applied the @cached attribute to get_target.

bogdanm merged commit 99dbc8b into master Jul 12, 2016

bogdanm deleted the fix_targets_py branch July 12, 2016 16:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix targets py #2148

Fix targets py #2148

bogdanm commented Jul 12, 2016

bogdanm commented Jul 12, 2016

0xc0170 commented Jul 12, 2016

bogdanm commented Jul 12, 2016

theotherjimmy commented Jul 12, 2016

Fix targets py #2148

Fix targets py #2148

Conversation

bogdanm commented Jul 12, 2016

bogdanm commented Jul 12, 2016

0xc0170 commented Jul 12, 2016

bogdanm commented Jul 12, 2016

theotherjimmy commented Jul 12, 2016