From a8306cb98ff920b38db5e5bbfcbe71bb36859b3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 13 May 2004 19:14:49 +0000
Subject: * The build hooks used to implement distributed builds can now be run
   in parallel.  Hooks are more efficient: locks on output paths are   only
 acquired when the hook says that it is willing to accept a   build job. 
 Hooks now work in two phases.  First, they should first   tell Nix whether
 they are willing to accept a job.  Nix guarantuees   that no two hooks will
 ever be in the first phase at the same time   (this simplifies the
 implementation of hooks, since they don't have   to perform locking (?)). 
 Second, if they accept a job, they are   then responsible for building it (on
 the remote system), and copying   the result back.  These can be run in
 parallel with other hooks and   locally executed jobs.

  The implementation is a bit messy right now, though.

* The directory `distributed' shows a (hacky) example of a hook that
  distributes build jobs over a set of machines listed in a
  configuration file.
---
 tests/Makefile.am        |  6 ++++--
 tests/build-hook.hook.sh | 16 ++++++++++------
 tests/build-hook.sh      |  2 +-
 tests/parallel.sh        |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4256625d9dc2..4c8e5d8a54a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,8 +18,10 @@ locking.sh: locking.nix
 parallel.sh: parallel.nix
 build-hook.sh: build-hook.nix
 
-TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \
-  build-hook.sh
+TESTS = init.sh build-hook.sh
+
+#TESTS = init.sh simple.sh dependencies.sh locking.sh parallel.sh \
+#  build-hook.sh
 
 XFAIL_TESTS =
 
diff --git a/tests/build-hook.hook.sh b/tests/build-hook.hook.sh
index 7176315d9d11..bbf423017f18 100644
--- a/tests/build-hook.hook.sh
+++ b/tests/build-hook.hook.sh
@@ -1,17 +1,21 @@
+#! /bin/sh
+
 set -x
 
-drv=$1
+drv=$4
 
-echo "HOOK for $drv"
+echo "HOOK for $drv" >&2
 
 outPath=$(sed 's/Derive(\[\"\([^\"]*\)\".*/\1/' $drv)
 
-echo "output path is $outPath"
+echo "output path is $outPath" >&2
 
 if $(echo $outPath | grep -q input-1); then
+    echo "accept" >&3
+    read x <&4
+    echo "got $x"
     mkdir $outPath
     echo "BAR" > $outPath/foo
-    exit 100
+else
+    echo "decline" >&3
 fi
-
-exit 101
\ No newline at end of file
diff --git a/tests/build-hook.sh b/tests/build-hook.sh
index bd74e42fe366..417f8c6d0300 100644
--- a/tests/build-hook.sh
+++ b/tests/build-hook.sh
@@ -1,4 +1,4 @@
-export NIX_BUILD_HOOK="sh build-hook.hook.sh"
+export NIX_BUILD_HOOK="build-hook.hook.sh"
 
 storeExpr=$($TOP/src/nix-instantiate/nix-instantiate build-hook.nix)
 
diff --git a/tests/parallel.sh b/tests/parallel.sh
index 70996015f838..d16da3a7ac20 100644
--- a/tests/parallel.sh
+++ b/tests/parallel.sh
@@ -2,7 +2,7 @@ storeExpr=$($TOP/src/nix-instantiate/nix-instantiate parallel.nix)
 
 echo "store expr is $storeExpr"
 
-outPath=$($TOP/src/nix-store/nix-store -qnfvvvv -j0 "$storeExpr")
+outPath=$($TOP/src/nix-store/nix-store -qnfvvvv -j10000 "$storeExpr")
 
 echo "output path is $outPath"
 
-- 
cgit 1.4.1