From cbc8d083acce04a1be6bce23f97956c4c87bbcda Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 May 2005 14:22:36 +0000 Subject: [PATCH] * Make unpacking of patch sequences much faster by not doing redundant unpacking and repacking of intermediate paths. --- NEWS | 6 ++++ scripts/download-using-manifests.pl.in | 48 +++++++++++++++++--------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index ef9605236..de243fc4d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Version 0.9 + +* Unpacking of patch sequences is much faster now by not doing + redundant unpacking and repacking of intermediate paths. + + Version 0.8 (April 11, 2005) NOTE: the hashing scheme in Nix 0.8 changed (as detailed below). As a diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index 8c75ab109..72589ead7 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -207,11 +207,19 @@ while (scalar @path > 0) { my $v = $edge->{end}; print "\n*** Step $curStep/$maxStep: "; - $curStep++; if ($edge->{type} eq "present") { print "using already present path `$v'\n"; print LOGFILE "$$ present $v\n"; + + if ($curStep < $maxStep) { + # Since this is not the last step, the path will be used + # as a base to one or more patches. So turn the base path + # into a NAR archive, to which we can apply the patch. + print " packing base path...\n"; + system "@bindir@/nix-store --dump $v > /tmp/nar"; + die "cannot dump `$v'" if ($? != 0); + } } elsif ($edge->{type} eq "patch") { @@ -224,21 +232,22 @@ while (scalar @path > 0) { print " downloading patch...\n"; my $patchPath = downloadFile "$patch->{url}", "$patch->{hash}"; - # Turn the base path into a NAR archive, to which we can - # actually apply the patch. - print " packing base path...\n"; - system "@bindir@/nix-store --dump $patch->{basePath} > /tmp/nar"; - die "cannot dump `$patch->{basePath}'" if ($? != 0); - - # Apply the patch. + # Apply the patch to the NAR archive produced in step 1 (for + # the already present path) or a later step (for patch sequences). print " applying patch...\n"; system "@libexecdir@/bspatch /tmp/nar /tmp/nar2 $patchPath"; die "cannot apply patch `$patchPath' to /tmp/nar" if ($? != 0); - # Unpack the resulting NAR archive into the target path. - print " unpacking patched archive...\n"; - system "@bindir@/nix-store --restore $v < /tmp/nar2"; - die "cannot unpack /tmp/nar2 into `$v'" if ($? != 0); + if ($curStep < $maxStep) { + # The archive will be used as the base of the next patch. + rename "/tmp/nar2", "/tmp/nar" or die "cannot rename NAR archive: $!"; + } else { + # This was the last patch. Unpack the final NAR archive + # into the target path. + print " unpacking patched archive...\n"; + system "@bindir@/nix-store --restore $v < /tmp/nar2"; + die "cannot unpack /tmp/nar2 into `$v'" if ($? != 0); + } } elsif ($edge->{type} eq "narfile") { @@ -251,11 +260,18 @@ while (scalar @path > 0) { print " downloading archive...\n"; my $narFilePath = downloadFile "$narFile->{url}", "$narFile->{hash}"; - # Unpack the archive into the target path. - print " unpacking archive...\n"; - system "@bunzip2@ < '$narFilePath' | @bindir@/nix-store --restore '$v'"; - die "cannot unpack `$narFilePath' into `$v'" if ($? != 0); + if ($curStep < $maxStep) { + # The archive will be used a base to a patch. + system "@bunzip2@ < '$narFilePath' > /tmp/nar"; + } else { + # Unpack the archive into the target path. + print " unpacking archive...\n"; + system "@bunzip2@ < '$narFilePath' | @bindir@/nix-store --restore '$v'"; + die "cannot unpack `$narFilePath' into `$v'" if ($? != 0); + } } + + $curStep++; }