Acquire jobserver's token prior to opening the lockfile

[goredo.git] / run.go

diff --git a/run.go b/run.go
index c0d6eda2fd0f31920d13034e28592fa05ace013c..44d25d55045943eafcc873831444915ae458b404 100644 (file)
--- a/run.go
+++ b/run.go
@@ -194,6 +194,15 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                return TgtError{tgtOrig, err}
        }
 
+       shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgtOrig, cwd)
+       jsToken := jsAcquire(shCtx)
+       jsNeedsRelease := true
+       defer func() {
+               if jsNeedsRelease {
+                       jsRelease(shCtx, jsToken)
+               }
+       }()
+
        // Acquire lock
        fdLock, err := os.OpenFile(
                path.Join(redoDir, tgt+LockSuffix),
@@ -381,6 +390,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                path.Join(dirPrefix, basename),
                tmpPathRel,
        )
+       shCtx = fmt.Sprintf(
+               "sh: %s: %s %s cwd:%s dirprefix:%s",
+               tgtOrig, cmdName, args, cwd, dirPrefix,
+       )
 
        cmd := exec.Command(cmdName, args...)
        cmd.Dir = cwd
@@ -423,15 +436,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                        return TgtError{tgtOrig, err}
                }
        }
-       shCtx := fmt.Sprintf(
-               "sh: %s: %s %s cwd:%s dirprefix:%s",
-               tgtOrig, cmdName, args, cwd, dirPrefix,
-       )
        tracef(CDebug, "%s", shCtx)
 
+       jsNeedsRelease = false
        Jobs.Add(1)
        go func() {
-               jsToken := jsAcquire(shCtx)
                if JSR == nil {
                        // infinite jobs
                        cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvJobs))
@@ -453,6 +462,8 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                        }
                }
 
+               defer jsRelease(shCtx, jsToken)
+
                var finished time.Time
                var exitErr *exec.ExitError
                started := time.Now()
@@ -483,7 +494,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDepCwd, cwd))
 
                defer func() {
-                       jsRelease(shCtx, jsToken)
                        fdDep.Close()
                        fdStdout.Close()
                        if fdStderr != nil {