ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

hydra-eval-jobs: Use JSON instead of XML

Browse Source 
XML::Simple is pretty slow - reading the output for the Nixpkgs jobset
takes half a minute or so. JSON is pretty much instantaneous.
This commit is contained in:
Eelco Dolstra
2014-09-30 00:20:54 +02:00
parent d9a5143fcb
commit 09a96c642a
3 changed files with 56 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/script/hydra-evaluator
View File

@ -144,9 +144,11 @@ sub checkJobsetWrapped {
# Evaluate the job expression.
my $evalStart = time;
my ($jobs, $nixExprInput, $msg) = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath);
my ($jobs, $nixExprInput) = evalJobs($inputInfo, $exprType, $jobset->nixexprinput, $jobset->nixexprpath);
my $evalStop = time;
$jobs->{$_}->{jobName} = $_ for keys %{$jobs};
my $jobOutPathMap = {};
txn_do($db, sub {
@ -160,8 +162,8 @@ sub checkJobsetWrapped {
# Schedule each successfully evaluated job.
my %buildMap;
foreach my $job (permute @{$jobs->{job}}) {
next if $job->{jobName} eq "";
foreach my $job (permute(values %{$jobs})) {
next if defined $job->{error};
print STDERR " considering job " . $project->name, ":", $jobset->name, ":", $job->{jobName} . "\n";
checkBuild($db, $jobset, $inputInfo, $nixExprInput, $job, \%buildMap, $prevEval, $jobOutPathMap, $plugins);
}
@ -244,10 +246,12 @@ sub checkJobsetWrapped {
});
# Store the error messages for jobs that failed to evaluate.
foreach my $error (@{$jobs->{error}}) {
my $msg = "";
foreach my $job (values %{$jobs}) {
next unless defined $job->{error};
$msg .=
($error->{location} ne "" ? "in job ‘$error->{location}’" : "at top-level") .
":\n" . $error->{msg} . "\n\n";
($job->{jobName} ne "" ? "in job ‘$job->{jobName}’" : "at top-level") .
":\n" . $job->{error} . "\n\n";
}
setJobsetError($jobset, $msg);
}