diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2020-05-28 15:34:15 +0200 |
|---|---|---|
| committer | Valentin David <valentin.david@codethink.co.uk> | 2020-06-03 10:35:18 +0000 |
| commit | 8ae5e115a4693ff33248278f5702614ff6f3abee (patch) | |
| tree | 42fb0714c0ecdffd800d1a9b35b77c1cc9c7bad2 /tests | |
| parent | 76c51c2d1f00f171c1cf6e517cc4d7e43c740d28 (diff) | |
| download | buildstream-8ae5e115a4693ff33248278f5702614ff6f3abee.tar.gz | |
Optimize variable flattening
Verifying for variables (all used variables defined and no cycle) is
much faster than flattening them. It also uses much less memory. Only
`bst show -f "%{vars}"` requires to flatten all variables. For other
cases we can improve performance by only checking rather than
flattening.
Also flattening very nested variables could lead to very long lists of
empty strings. The memory usage for flattening could be a lot bigger
than the resulting value. Force flattening and caching every
variable definitions can improve intermediate memory consumption and
only consume memory of the size of the result.
Finally, an optimization allowed inifinite cycles leading to
segmentation fault. This was solved by simplifying the code.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/format/variables.py | 9 | ||||
| -rw-r--r-- | tests/format/variables/cyclic_variables/simple-cyclic.bst | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index 616dc20c1..c5e8eebad 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -63,6 +63,15 @@ def test_missing_variable(cli, datafiles, element): @pytest.mark.timeout(15, method="signal") @pytest.mark.datafiles(os.path.join(DATA_DIR, "cyclic_variables")) +def test_simple_cyclic_variables(cli, datafiles): + print_warning("Performing cyclic test, if this test times out it will " + "exit the test sequence") + project = str(datafiles) + result = cli.run(project=project, silent=True, args=["build", "simple-cyclic.bst"]) + result.assert_main_error(ErrorDomain.LOAD, LoadErrorReason.RECURSIVE_VARIABLE) + + +@pytest.mark.timeout(15, method="signal") +@pytest.mark.datafiles(os.path.join(DATA_DIR, "cyclic_variables")) def test_cyclic_variables(cli, datafiles): print_warning("Performing cyclic test, if this test times out it will " + "exit the test sequence") project = str(datafiles) diff --git a/tests/format/variables/cyclic_variables/simple-cyclic.bst b/tests/format/variables/cyclic_variables/simple-cyclic.bst new file mode 100644 index 000000000..806e1f390 --- /dev/null +++ b/tests/format/variables/cyclic_variables/simple-cyclic.bst @@ -0,0 +1,5 @@ +kind: manual + +variables: + a: "%{b}" + b: "%{a}" |