aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-08-22 13:52:17 +0000
committerFrancois Pons <fpons@mandriva.com>2003-08-22 13:52:17 +0000
commitae7d48967d9514b7f73b9f49ecc5f14785f22335 (patch)
tree25b2592769ab2d36ce9c639b304ea146ea6b5120
parent8a2907b8af95bd0bac5abc71b5c5707250271059 (diff)
downloadperl-URPM-ae7d48967d9514b7f73b9f49ecc5f14785f22335.tar
perl-URPM-ae7d48967d9514b7f73b9f49ecc5f14785f22335.tar.gz
perl-URPM-ae7d48967d9514b7f73b9f49ecc5f14785f22335.tar.bz2
perl-URPM-ae7d48967d9514b7f73b9f49ecc5f14785f22335.tar.xz
perl-URPM-ae7d48967d9514b7f73b9f49ecc5f14785f22335.zip
removed potential deadlock.
-rw-r--r--URPM/Resolve.pm73
1 files changed, 40 insertions, 33 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 1354f37..a644994 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -191,43 +191,50 @@ sub backtrack_selected {
my @properties;
if (defined $dep->{required}) {
- #- search for all possible packages, first is to try the selection, then if it is
- #- impossible, backtrack the origin.
- my $packages = $urpm->find_candidate_packages($dep->{required});
-
- foreach (values %$packages) {
- foreach (@$_) {
- #- avoid dead loop.
- exists $state->{backtrack}{selected}{$_->id} and next;
- #- a package if found is problably rejected or there is a problem.
- if ($state->{rejected}{$_->fullname}) {
- if (!$options{callback_backtrack} ||
- $options{callback_backtrack}->($urpm, $db, $state, $_,
- dep => $dep, alternatives => $packages, %options) <= 0) {
- #- keep in mind a backtrack has happening here...
- $state->{rejected}{$_->fullname}{backtrack} ||=
- { exists $dep->{promote} ? (promote => $dep->{promote}) : @{[]},
- exists $dep->{psel} ? (psel => $dep->{psel}) : @{[]},
- };
- #- backtrack callback should return a strictly positive value if the selection of the new
- #- package is prefered over the currently selected package.
- next;
+ #- avoid deadlock here...
+ if (exists $state->{backtrack}{deadlock}{$dep->{required}}) {
+ $options{keep} = 1; #- force keeping package to that backtrakc is doing something.
+ } else {
+ $state->{backtrack}{deadlock}{$dep->{required}} = undef;
+
+ #- search for all possible packages, first is to try the selection, then if it is
+ #- impossible, backtrack the origin.
+ my $packages = $urpm->find_candidate_packages($dep->{required});
+
+ foreach (values %$packages) {
+ foreach (@$_) {
+ #- avoid dead loop.
+ exists $state->{backtrack}{selected}{$_->id} and next;
+ #- a package if found is problably rejected or there is a problem.
+ if ($state->{rejected}{$_->fullname}) {
+ if (!$options{callback_backtrack} ||
+ $options{callback_backtrack}->($urpm, $db, $state, $_,
+ dep => $dep, alternatives => $packages, %options) <= 0) {
+ #- keep in mind a backtrack has happening here...
+ $state->{rejected}{$_->fullname}{backtrack} ||=
+ { exists $dep->{promote} ? (promote => $dep->{promote}) : @{[]},
+ exists $dep->{psel} ? (psel => $dep->{psel}) : @{[]},
+ };
+ #- backtrack callback should return a strictly positive value if the selection of the new
+ #- package is prefered over the currently selected package.
+ next;
+ }
}
- }
- $state->{backtrack}{selected}{$_->id} = undef;
+ $state->{backtrack}{selected}{$_->id} = undef;
- #- in such case, we need to drop the problem caused so that rejected condition is removed.
- #- if this is not possible, the next backtrack on the same package will be refused above.
- my @l = map { $urpm->search($_, strict_fullname => 1) }
- keys %{($state->{rejected}{$_->fullname} || {})->{closure}};
+ #- in such case, we need to drop the problem caused so that rejected condition is removed.
+ #- if this is not possible, the next backtrack on the same package will be refused above.
+ my @l = map { $urpm->search($_, strict_fullname => 1) }
+ keys %{($state->{rejected}{$_->fullname} || {})->{closure}};
- $options{keep_unrequested_dependencies} ? $urpm->disable_selected($db, $state, @l) :
- $urpm->disable_selected_unrequested_dependencies($db, $state, @l);
+ $options{keep_unrequested_dependencies} ? $urpm->disable_selected($db, $state, @l) :
+ $urpm->disable_selected_unrequested_dependencies($db, $state, @l);
- return { required => $_->id,
- exists $dep->{from} ? (from => $dep->{from}) : @{[]},
- exists $dep->{requested} ? (requested => $dep->{requested}) : @{[]},
- };
+ return { required => $_->id,
+ exists $dep->{from} ? (from => $dep->{from}) : @{[]},
+ exists $dep->{requested} ? (requested => $dep->{requested}) : @{[]},
+ };
+ }
}
}
}