summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-02-27 14:54:35 -0600
committerJohn Estabrook <jestabro@vyos.io>2024-02-28 14:02:49 -0600
commit5c173c5935eab3a8bd0f169759617c4296a92df7 (patch)
treec3ef8e48c55c2f700f932fc29870dc8c5b9b9d42
parent8b87836b371fdddb595ad3faf8a91a64f07c2bfb (diff)
downloadvyos-1x-5c173c5935eab3a8bd0f169759617c4296a92df7.tar.gz
vyos-1x-5c173c5935eab3a8bd0f169759617c4296a92df7.zip
configdep: T5839: remove trivially redundant config dependency calls
-rw-r--r--python/vyos/configdep.py35
1 files changed, 33 insertions, 2 deletions
diff --git a/python/vyos/configdep.py b/python/vyos/configdep.py
index 64727d355..41252d8f5 100644
--- a/python/vyos/configdep.py
+++ b/python/vyos/configdep.py
@@ -1,4 +1,4 @@
-# Copyright 2023 VyOS maintainers and contributors <maintainers@vyos.io>
+# Copyright 2023-2024 VyOS maintainers and contributors <maintainers@vyos.io>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -35,6 +35,12 @@ dependency_dir = os.path.join(directories['data'],
dependent_func: dict[str, list[typing.Callable]] = {}
+DEBUG = False
+
+def debug_print(s: str):
+ if DEBUG:
+ print(s)
+
def canon_name(name: str) -> str:
return os.path.splitext(name)[0].replace('-', '_')
@@ -45,6 +51,26 @@ def canon_name_of_path(path: str) -> str:
def caller_name() -> str:
return stack()[2].filename
+def name_of(f: typing.Callable) -> str:
+ return f.__name__
+
+def names_of(l: list[typing.Callable]) -> list[str]:
+ return [name_of(f) for f in l]
+
+def remove_redundant(l: list[typing.Callable]) -> list[typing.Callable]:
+ names = set()
+ for e in reversed(l):
+ _ = l.remove(e) if name_of(e) in names else names.add(name_of(e))
+
+def append_uniq(l: list[typing.Callable], e: typing.Callable):
+ """Append an element, removing earlier occurrences
+
+ The list of dependencies is generally short and traversing the list on
+ each append is preferable to the cost of redundant script invocation.
+ """
+ l.append(e)
+ remove_redundant(l)
+
def read_dependency_dict(dependency_dir: str = dependency_dir) -> dict:
res = {}
for dep_file in os.listdir(dependency_dir):
@@ -95,16 +121,21 @@ def set_dependents(case: str, config: 'Config',
tagnode: typing.Optional[str] = None):
d = get_dependency_dict(config)
k = canon_name_of_path(caller_name())
+ tag_ext = f'_{tagnode}' if tagnode is not None else ''
l = dependent_func.setdefault(k, [])
for target in d[k][case]:
func = def_closure(target, config, tagnode)
- l.append(func)
+ func.__name__ = f'{target}{tag_ext}'
+ append_uniq(l, func)
+ debug_print(f'set_dependents: caller {k}, dependents {names_of(l)}')
def call_dependents():
k = canon_name_of_path(caller_name())
l = dependent_func.get(k, [])
+ debug_print(f'call_dependents: caller {k}, dependents {names_of(l)}')
while l:
f = l.pop(0)
+ debug_print(f'calling: {f.__name__}')
f()
def called_as_dependent() -> bool: