Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-08-01 10:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate solver's ad-hoc debug logging

Browse Source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2018-03-31 07:04:35 +00:00
parent 1e9fc7e826
commit 41978869ce
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
britney.py
View File

@ -449,7 +449,13 @@ class Britney(object):
self.logger.setLevel(logging.INFO) self.logger.setLevel(logging.INFO)
else: else:
self.logger.setLevel(logging.WARNING) self.logger.setLevel(logging.WARNING)
# TODO: Define a more obvious toggle for debug information
try: # pragma: no cover
if int(os.environ.get('BRITNEY_DEBUG', '0')):
self.logger.setLevel(logging.DEBUG)
except ValueError: # pragma: no cover
pass
# integrity checks # integrity checks
if self.options.nuninst_cache and self.options.print_uninst: # pragma: no cover if self.options.nuninst_cache and self.options.print_uninst: # pragma: no cover
self.logger.error("nuninst_cache and print_uninst are mutually exclusive!") self.logger.error("nuninst_cache and print_uninst are mutually exclusive!")

45
britney2/installability/solver.py
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
import os import logging
from collections import deque from collections import deque
from britney2.utils import (ifilter_only, iter_except) from britney2.utils import (ifilter_only, iter_except)
@ -155,7 +155,6 @@ class InstallabilitySolver(InstallabilityTester):
super().__init__(universe, revuniverse, testing, super().__init__(universe, revuniverse, testing,
broken, essentials, safe_set, eqv_table) broken, essentials, safe_set, eqv_table)
def solve_groups(self, groups): def solve_groups(self, groups):
sat_in_testing = self._testing.isdisjoint sat_in_testing = self._testing.isdisjoint
universe = self._universe universe = self._universe
@ -168,12 +167,7 @@ class InstallabilitySolver(InstallabilityTester):
key2item = {} key2item = {}
going_out = set() going_out = set()
going_in = set() going_in = set()
debug_solver = 0 debug_solver = self.logger.isEnabledFor(logging.DEBUG)
try: # pragma: no cover
debug_solver = int(os.environ.get('BRITNEY_DEBUG', '0'))
except: # pragma: no cover
pass
# Build the tables # Build the tables
for (item, adds, rms) in groups: for (item, adds, rms) in groups:
@ -187,7 +181,7 @@ class InstallabilitySolver(InstallabilityTester):
for r in rms: for r in rms:
ptable[r] = key ptable[r] = key
if debug_solver > 1: # pragma: no cover if debug_solver: # pragma: no cover
self._dump_groups(groups) self._dump_groups(groups)
# This large loop will add ordering constrains on each "item" # This large loop will add ordering constrains on each "item"
@ -215,7 +209,7 @@ class InstallabilitySolver(InstallabilityTester):
# "Self-conflicts" => ignore # "Self-conflicts" => ignore
continue continue
if debug_solver and other not in order[key]['before']: # pragma: no cover if debug_solver and other not in order[key]['before']: # pragma: no cover
print("N: Conflict induced order: %s before %s" % (key, other)) self.logger.debug("Conflict induced order: %s before %s", key, other)
order[key]['before'].add(other) order[key]['before'].add(other)
order[other]['after'].add(key) order[other]['after'].add(key)
@ -234,7 +228,7 @@ class InstallabilitySolver(InstallabilityTester):
# "Self-dependency" => ignore # "Self-dependency" => ignore
continue continue
if debug_solver and other not in order[key]['after']: # pragma: no cover if debug_solver and other not in order[key]['after']: # pragma: no cover
print("N: Removal induced order: %s before %s" % (key, other)) self.logger.debug("Removal induced order: %s before %s", key, other)
order[key]['after'].add(other) order[key]['after'].add(other)
order[other]['before'].add(key) order[other]['before'].add(key)
@ -271,17 +265,17 @@ class InstallabilitySolver(InstallabilityTester):
for other in (other_adds - other_rms): for other in (other_adds - other_rms):
if debug_solver and other != key and other not in order[key]['after']: # pragma: no cover if debug_solver and other != key and other not in order[key]['after']: # pragma: no cover
print("N: Dependency induced order (add): %s before %s" % (key, other)) self.logger.debug("Dependency induced order (add): %s before %s", key, other)
order[key]['after'].add(other) order[key]['after'].add(other)
order[other]['before'].add(key) order[other]['before'].add(key)
for other in (other_rms - other_adds): for other in (other_rms - other_adds):
if debug_solver and other != key and other not in order[key]['before']: # pragma: no cover if debug_solver and other != key and other not in order[key]['before']: # pragma: no cover
print("N: Dependency induced order (remove): %s before %s" % (key, other)) self.logger.debug("Dependency induced order (remove): %s before %s", key, other)
order[key]['before'].add(other) order[key]['before'].add(other)
order[other]['after'].add(key) order[other]['after'].add(key)
### MILESTONE: Partial-order constrains computed ### # === MILESTONE: Partial-order constrains computed ===
# At this point, we have computed all the partial-order # At this point, we have computed all the partial-order
# constrains needed. Some of these may have created strongly # constrains needed. Some of these may have created strongly
@ -317,7 +311,7 @@ class InstallabilitySolver(InstallabilityTester):
merged[n] = scc_id merged[n] = scc_id
del order[n] del order[n]
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
print("N: SCC: %s -- %s" % (scc_id, str(sorted(com)))) self.logger.debug("SCC: %s -- %s", scc_id, str(sorted(com)))
for com in comps: for com in comps:
node = com[0] node = com[0]
@ -339,31 +333,31 @@ class InstallabilitySolver(InstallabilityTester):
order[other_scc_id]['before'].add(scc_id) order[other_scc_id]['before'].add(scc_id)
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
print("N: -- PARTIAL ORDER --") self.logger.debug("-- PARTIAL ORDER --")
initial_round = [] initial_round = []
for com in sorted(order): for com in sorted(order):
if debug_solver and order[com]['before']: # pragma: no cover if debug_solver and order[com]['before']: # pragma: no cover
print("N: %s <= %s" % (com, str(sorted(order[com]['before'])))) self.logger.debug("N: %s <= %s", com, str(sorted(order[com]['before'])))
if not order[com]['after']: if not order[com]['after']:
# This component can be scheduled immediately, add it # This component can be scheduled immediately, add it
# to the queue # to the queue
initial_round.append(com) initial_round.append(com)
elif debug_solver: # pragma: no cover elif debug_solver: # pragma: no cover
print("N: %s >= %s" % (com, str(sorted(order[com]['after'])))) self.logger.debug("N: %s >= %s", com, str(sorted(order[com]['after'])))
queue.extend(sorted(initial_round, key=len)) queue.extend(sorted(initial_round, key=len))
del initial_round del initial_round
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
print("N: -- END PARTIAL ORDER --") self.logger.debug("-- END PARTIAL ORDER --")
print("N: -- LINEARIZED ORDER --") self.logger.debug("-- LINEARIZED ORDER --")
for cur in iter_except(queue.popleft, IndexError): for cur in iter_except(queue.popleft, IndexError):
if order[cur]['after'] <= emitted and cur not in emitted: if order[cur]['after'] <= emitted and cur not in emitted:
# This item is ready to be emitted right now # This item is ready to be emitted right now
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
print("N: %s -- %s" % (cur, sorted(scc[cur]))) self.logger.debug("%s -- %s", cur, sorted(scc[cur]))
emitted.add(cur) emitted.add(cur)
result.append([key2item[x] for x in scc[cur]]) result.append([key2item[x] for x in scc[cur]])
if order[cur]['before']: if order[cur]['before']:
@ -374,13 +368,12 @@ class InstallabilitySolver(InstallabilityTester):
queue.extend(sorted(order[cur]['before'] - emitted, key=len)) queue.extend(sorted(order[cur]['before'] - emitted, key=len))
if debug_solver: # pragma: no cover if debug_solver: # pragma: no cover
print("N: -- END LINEARIZED ORDER --") self.logger.debug("-- END LINEARIZED ORDER --")
return result return result
def _dump_groups(self, groups): # pragma: no cover def _dump_groups(self, groups): # pragma: no cover
print("N: === Groups ===") self.logger.debug("=== Groups ===")
for (item, adds, rms) in groups: for (item, adds, rms) in groups:
print("N: %s => A: %s, R: %s" % (str(item), str(adds), str(rms))) self.logger.debug("%s => A: %s, R: %s", str(item), str(adds), str(rms))
print("N: === END Groups ===") self.logger.debug("=== END Groups ===")

3
britney2/installability/tester.py
View File

@ -14,6 +14,7 @@
from collections import defaultdict from collections import defaultdict
from functools import partial from functools import partial
import logging
from itertools import chain, filterfalse from itertools import chain, filterfalse
from britney2.utils import iter_except from britney2.utils import iter_except
@ -56,6 +57,8 @@ class InstallabilityTester(object):
self._safe_set = safe_set self._safe_set = safe_set
self._eqv_table = eqv_table self._eqv_table = eqv_table
self._stats = InstallabilityStats() self._stats = InstallabilityStats()
logger_name = ".".join((self.__class__.__module__, self.__class__.__name__))
self.logger = logging.getLogger(logger_name)
# Cache of packages known to be broken - we deliberately do not # Cache of packages known to be broken - we deliberately do not
# include "broken" in it. See _optimize for more info. # include "broken" in it. See _optimize for more info.