cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak to allow subclasses of cores that get their own separate lists

Browse Source 
(such as local fetcher jobs)
This commit is contained in:
espie 2011-03-22 19:49:56 +00:00
parent cabe19ad60
commit d76bdca371
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
infrastructure/lib/DPB/Core.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4: # ex:ts=8 sw=4:
# $OpenBSD: Core.pm,v 1.5 2010/10/29 11:51:42 espie Exp $ # $OpenBSD: Core.pm,v 1.6 2011/03/22 19:49:56 espie Exp $
# #
# Copyright (c) 2010 Marc Espie <espie@openbsd.org> # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
# #
@ -432,7 +432,7 @@ sub init_cores
package DPB::Core; package DPB::Core;
our @ISA = qw(DPB::Core::WithJobs); our @ISA = qw(DPB::Core::WithJobs);
my @available = (); my $available = [];
# used to remove cores from the build # used to remove cores from the build
my %stopped = (); my %stopped = ();
@ -504,7 +504,7 @@ sub mark_ready
if (-e "$logdir/stop-$hostname") { if (-e "$logdir/stop-$hostname") {
push(@{$stopped{$hostname}}, $self); push(@{$stopped{$hostname}}, $self);
} else { } else {
push(@available, $self); $self->mark_available($self);
} }
return $self; return $self;
} }
@ -514,11 +514,22 @@ sub avail
my $self = shift; my $self = shift;
for my $h (keys %stopped) { for my $h (keys %stopped) {
if (!-e "$logdir/stop-$h") { if (!-e "$logdir/stop-$h") {
push(@available, @{$stopped{$h}}); $self->mark_available($self);
delete $stopped{$h}; delete $stopped{$h};
} }
} }
return scalar(@available); return scalar(@{$self->available});
}
sub available
{
return $available;
}
sub mark_available
{
my $self = shift;
push(@{$self->available}, @_);
} }
sub running sub running
@ -528,10 +539,12 @@ sub running
sub get sub get
{ {
if (@available > 1) { my $self = shift;
@available = sort {$b->sf <=> $a->sf} @available; $a = $self->available;
if (@$a > 1) {
@$a = sort {$b->sf <=> $a->sf} @$a;
} }
return shift @available; return shift @$a;
} }
my @all_cores = (); my @all_cores = ();
@ -634,6 +647,16 @@ sub hostname
return $host; return $host;
} }
package DPB::Core::Fetcher;
our @ISA = qw(DPB::Core::Local);
my $fetchcores = [];
sub available
{
return $fetchcores;
}
package DPB::Core::Clock; package DPB::Core::Clock;
our @ISA = qw(DPB::Core::Special); our @ISA = qw(DPB::Core::Special);