Merge pull request #11632 from mlschroe/master

[backend] use SCCs for the cycle handling code
openSUSE · Sep 17, 2021 · 82b67f0 · 82b67f0
2 parents f63871c + a543431
commit 82b67f0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/backend/BSSched/Checker.pm b/src/backend/BSSched/Checker.pm
@@ -805,8 +805,19 @@ sub expandandsort {
   # now sort
   print "    sorting ".@$packs." packages\n";
   my @cycles;
+  my @sccs;
+  delete $ctx->{'sccs'};
   if (@$packs > 1) {
-    if (defined &BSSolv::depsort2) {
+    if (defined(&BSSolv::depsort2) && defined(&BSSolv::setdepsortsccs)) {
+      BSSolv::setdepsortsccs(2);
+      @$packs = BSSolv::depsort2(\%pdeps, $ctx->{'dep2src'}, \%pkg2src, \@cycles, @$packs);
+      BSSolv::setdepsortsccs(0);
+      if (@cycles) {
+        push @sccs, shift @cycles while @cycles && @{$cycles[0]};
+        shift @cycles;
+      }
+      $ctx->{'sccs'} = \@sccs;
+    } elsif (defined &BSSolv::depsort2) {
       @$packs = BSSolv::depsort2(\%pdeps, $ctx->{'dep2src'}, \%pkg2src, \@cycles, @$packs);
     } else {
       @$packs = emulate_depsort2(\%pdeps, $ctx->{'dep2src'}, \%pkg2src, \@cycles, @$packs);
@@ -835,12 +846,14 @@ sub expandandsort {
   for (values %pkg2src) {
     $prunedsubpacks{$_} = $subpacks->{$_} if $subpacks->{$_};
   }
-  BSUtil::store("$gdst/.:depends", "$gdst/:depends", {
+  my $depends = {
     'pkgdeps' => \%pdeps,
     'subpacks' => \%prunedsubpacks,
     'pkg2src' => \%pkg2src,
-    'cycles' => \@cycles,
-  });
+  };
+  $depends->{'cycles'} = \@cycles if @cycles;
+  $depends->{'sccs'} = \@sccs if @sccs;
+  BSUtil::store("$gdst/.:depends", "$gdst/:depends", $depends);
   %prunedsubpacks = ();
   # remove old entries again
   for (keys %pkgdisabled) {
@@ -954,7 +967,7 @@ sub checkpkgs {
   $ctx->{'unfinished'} = \%unfinished;
 
   # now build cychash mapping packages to all other cycle members
-  for my $cyc (@{$ctx->{'cycles'} || []}) {
+  for my $cyc (@{$ctx->{'sccs'} || $ctx->{'cycles'} || []}) {
     next if @$cyc < 2;	# just in case
     my @c = map {@{$cychash{$_} || [ $_ ]}} @$cyc;
     @c = BSUtil::unify(sort(@c));

diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
@@ -721,6 +721,9 @@ our $builddepinfo = [
      [[ 'cycle' =>
 	  [ 'package' ],
      ]],
+     [[ 'scc' =>
+	  [ 'package' ],
+     ]],
 ];
 
 our $event = [

diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -3384,6 +3384,12 @@ sub getbuilddepinfo {
   my @cycles = map {{'package' => $_}} @{$depends->{'cycles'} || []};
   my $res = { 'package' => \@res, };
   $res->{'cycle'} = \@cycles if @cycles;
+  if (@{$depends->{'sccs'} || []}) {
+    my @sccs = @{$depends->{'sccs'} || []};
+    @$_ = sort @$_ for @sccs;
+    @sccs = sort {$a->[0] cmp $b->[0]} @sccs;
+    $res->{'sccs'} = [ map {{'package' => $_}} @sccs ];
+  }
   return ($res, $BSXML::builddepinfo);
 }