nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* When doing a query (e.g. `nix-store -r --dry-run'), don't make a lot

Browse source 
of expensive calls to `nix-store --check-validity'.
This commit is contained in:
Eelco Dolstra 2010-12-13 08:39:10 +00:00
parent 4d57776813
commit 542fc69062
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/download-using-manifests.pl.in
View file

@ -12,6 +12,10 @@ STDOUT->autoflush(1);
my $manifestDir = ($ENV{"NIX_MANIFESTS_DIR"} or "@localstatedir@/nix/manifests"); my $manifestDir = ($ENV{"NIX_MANIFESTS_DIR"} or "@localstatedir@/nix/manifests");
my $logFile = "@localstatedir@/log/nix/downloads"; my $logFile = "@localstatedir@/log/nix/downloads";
# For queries, skip expensive calls to nix-hash etc. We're just
# estimating the expected download size.
my $fast = 1;
# Load all manifests. # Load all manifests.
my %narFiles; my %narFiles;
@ -33,7 +37,11 @@ for my $manifest (glob "$manifestDir/*.nixmanifest") {
sub isValidPath { sub isValidPath {
my $p = shift; my $p = shift;
return system("$binDir/nix-store --check-validity '$p' 2> /dev/null") == 0; if ($fast) {
return -e $p;
} else {
return system("$binDir/nix-store --check-validity '$p' 2> /dev/null") == 0;
}
} }
@ -51,7 +59,6 @@ sub parseHash {
# given path. # given path.
sub computeSmallestDownload { sub computeSmallestDownload {
my $targetPath = shift; my $targetPath = shift;
my $fast = shift;
# Build a graph of all store paths that might contribute to the # Build a graph of all store paths that might contribute to the
# construction of $targetPath, and the special node "start". The # construction of $targetPath, and the special node "start". The
@ -207,7 +214,7 @@ if ($ARGV[0] eq "--query") {
print scalar @references, "\n"; print scalar @references, "\n";
print "$_\n" foreach @references; print "$_\n" foreach @references;
my @path = computeSmallestDownload $storePath, 1; my @path = computeSmallestDownload $storePath;
my $downloadSize = 0; my $downloadSize = 0;
while (scalar @path > 0) { while (scalar @path > 0) {
@ -241,6 +248,7 @@ elsif ($ARGV[0] ne "--substitute") {
die unless scalar @ARGV == 2; die unless scalar @ARGV == 2;
my $targetPath = $ARGV[1]; my $targetPath = $ARGV[1];
$fast = 0;
# Create a temporary directory. # Create a temporary directory.
@ -273,7 +281,7 @@ foreach my $localPath (@{$localPathList}) {
# Compute the shortest path. # Compute the shortest path.
my @path = computeSmallestDownload $targetPath, 0; my @path = computeSmallestDownload $targetPath;
die "don't know how to produce $targetPath\n" if scalar @path == 0; die "don't know how to produce $targetPath\n" if scalar @path == 0;