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

more sensible defaults: if at least one host uses mem, turn on WANTSIZE,

Browse Source 
unless we explicitly turn that off.
This commit is contained in:
espie 2013-10-13 10:34:55 +00:00
parent e902b8897f
commit 769e3b4c10
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
infrastructure/lib/DPB/Config.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Config.pm,v 1.15 2013/10/07 20:01:55 espie Exp $
# $OpenBSD: Config.pm,v 1.16 2013/10/13 10:34:55 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -109,8 +109,12 @@ sub parse_command_line
if ($state->define_present('LOGDIR')) {
$state->{logdir} = $state->subst->value('LOGDIR');
}
if ($state->define_present('WANTSIZE')) {
if ($state->{opt}{s}) {
$state->{wantsize} = 1;
} elsif ($state->define_present('WANTSIZE')) {
$state->{wantsize} = $state->{subst}->value('WANTSIZE');
} elsif (DPB::HostProperties->has_mem) {
$state->{wantsize} = 1;
}
if ($state->define_present('FETCH_JOBS') && !defined $state->{opt}{f}) {
$state->{opt}{f} = $state->{subst}->value('FETCH_JOBS');
@ -130,9 +134,6 @@ sub parse_command_line
if ($state->{opt}{t}) {
$state->{tests} = 1;
}
if ($state->{opt}{s}) {
$state->{wantsize} = 1;
}
$state->{opt}{f} //= 2;
if ($state->opt('f') !~ m/^\d+$/) {
@ -301,6 +302,7 @@ sub parse_hosts_file
package DPB::HostProperties;
my $has_sf = 0;
my $has_mem = 0;
my $sf;
sub new
@ -327,6 +329,11 @@ sub has_sf
return $has_sf;
}
sub has_mem
{
return $has_mem;
}
my $default_user;
sub finalize
{
@ -361,6 +368,9 @@ sub finalize
$_ *= 1024 * 1024;
}
$prop->{memory} = $_;
if ($prop->{memory} > 0) {
$has_mem = 1;
}
}
$prop->{small} //= 120;
$prop->{small_timeout} = $prop->{small} * $prop->{sf};