Optimise redo-sources

[goredo.git] / run.go

diff --git a/run.go b/run.go
index bb1efb0ad2526d4e7e6f05c2881dea55429ee2e8..6bd7029752d8fac0d13c6bb1a26e95c67c208953 100644 (file)
--- a/run.go
+++ b/run.go
@@ -31,7 +31,6 @@ import (
        "os"
        "os/exec"
        "path"
-       "path/filepath"
        "strconv"
        "strings"
        "sync"
@@ -138,7 +137,7 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                if os.IsNotExist(err) {
                        return false, nil, "", nil
                }
-               return false, nil, "", err
+               return false, nil, "", ErrLine(err)
        }
        defer fdDep.Close()
        r := recfile.NewReader(fdDep)
@@ -151,7 +150,7 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                        if errors.Is(err, io.EOF) {
                                break
                        }
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                if m["Type"] != DepTypeIfchange || m["Target"] != tgt {
                        continue
@@ -161,11 +160,11 @@ func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) {
                        if os.IsNotExist(err) {
                                return false, nil, "", nil
                        }
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                theirInode, err := inodeFromRec(m)
                if err != nil {
-                       return false, nil, "", err
+                       return false, nil, "", ErrLine(err)
                }
                hshPrev = m["Hash"]
                modified = !ourInode.Equals(theirInode)
@@ -188,7 +187,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        cwd, tgt := cwdAndTgt(tgtOrig)
        redoDir := path.Join(cwd, RedoDir)
        if err := mkdirs(redoDir); err != nil {
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
 
        shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgtOrig, cwd)
@@ -207,7 +206,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                os.FileMode(0666),
        )
        if err != nil {
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        flock := unix.Flock_t{
                Type:   unix.F_WRLCK,
@@ -227,7 +226,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil {
                if uintptr(err.(syscall.Errno)) != uintptr(unix.EAGAIN) {
                        fdLock.Close()
-                       return TgtError{tgtOrig, err}
+                       return TgtError{tgtOrig, ErrLine(err)}
                }
                Jobs.Add(1)
                if err = unix.FcntlFlock(fdLock.Fd(), unix.F_GETLK, &flock); err != nil {
@@ -257,20 +256,14 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        log.Fatal(err)
                                }
                        }
-                       var depInfo *DepInfo
-                       fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
+                       build, err := depReadBuild(path.Join(redoDir, tgt+DepSuffix))
                        if err != nil {
-                               if os.IsNotExist(err) {
+                               if errors.Is(err, fs.ErrNotExist) {
                                        err = errors.New("was not built: no .rec")
                                }
                                goto Finish
                        }
-                       defer fdDep.Close()
-                       depInfo, err = depRead(fdDep)
-                       if err != nil {
-                               goto Finish
-                       }
-                       if depInfo.build != BuildUUID {
+                       if build != BuildUUID {
                                err = errors.New("was not built: build differs")
                        }
                Finish:
@@ -285,14 +278,10 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
 
        // Check if it was already built in parallel
        if !forced {
-               if fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix)); err == nil {
-                       depInfo, err := depRead(fdDep)
-                       fdDep.Close()
-                       if err == nil && depInfo.build == BuildUUID {
-                               lockRelease()
-                               errs <- nil
-                               return nil
-                       }
+               if build, err := depReadBuild(path.Join(redoDir, tgt+DepSuffix)); err == nil && build == BuildUUID {
+                       lockRelease()
+                       errs <- nil
+                       return nil
                }
        }
 
@@ -318,7 +307,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        fdDep, err := tempfile(redoDir, tgt+DepSuffix)
        if err != nil {
                lockRelease()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        fdDepPath := fdDep.Name()
        cleanup := func() {
@@ -330,14 +319,14 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                recfile.Field{Name: "Build", Value: BuildUUID},
        ); err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
 
        // Find .do
        doFile, upLevels, err := findDo(fdDep, cwd, tgt)
        if err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        if doFile == "" {
                cleanup()
@@ -365,7 +354,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
 
        if err = depWrite(fdDep, cwdOrig, doFileRelPath, ""); err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        fdDep.Close()
        tracef(CWait, "%s", runErr.Name())
@@ -390,15 +379,12 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        fdStdout, err := tempfile(cwdOrig, tgt)
        if err != nil {
                cleanup()
-               return TgtError{tgtOrig, err}
+               return TgtError{tgtOrig, ErrLine(err)}
        }
        stdoutPath := fdStdout.Name()
        fdStdout.Close()
        tmpPath := stdoutPath + ".3" // and for $3
-       tmpPathRel, err := filepath.Rel(cwd, tmpPath)
-       if err != nil {
-               panic(err)
-       }
+       tmpPathRel := mustRel(cwd, tmpPath)
        args = append(
                args,
                path.Join(dirPrefix, tgt),
@@ -452,7 +438,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                )
                if err != nil {
                        cleanup()
-                       return TgtError{tgtOrig, err}
+                       return TgtError{tgtOrig, ErrLine(err)}
                }
        }
        tracef(CDebug, "%s", shCtx)
@@ -563,11 +549,13 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        var depInfo *DepInfo
                                        fdDep, err := os.Open(fdDepPath)
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
                                        depInfo, err = depRead(fdDep)
                                        fdDep.Close()
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
                                        for _, dep := range depInfo.ifchanges {
@@ -578,9 +566,10 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                        }
                                        _, err = recfile.NewWriter(w).WriteFields(fields...)
                                        if err != nil {
+                                               err = ErrLine(err)
                                                goto Err
                                        }
-                                       err = w.Flush()
+                                       err = ErrLine(w.Flush())
                                Err:
                                        if err != nil {
                                                log.Print(err)
@@ -698,7 +687,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                // Does it produce both stdout and tmp?
                fiStdout, err := os.Stat(fdStdout.Name())
                if err != nil {
-                       runErr.Err = err
+                       runErr.Err = ErrLine(err)
                        errs <- runErr
                        return
                }
@@ -711,8 +700,8 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                return
                        }
                        tmpExists = true
-               } else if !os.IsNotExist(err) {
-                       runErr.Err = err
+               } else if !errors.Is(err, fs.ErrNotExist) {
+                       runErr.Err = ErrLine(err)
                        errs <- runErr
                        return
                }
@@ -722,6 +711,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                if tmpExists {
                        fd, err = os.Open(tmpPath)
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                        defer fd.Close()
@@ -734,6 +724,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        os.Remove(path.Join(cwdOrig, tgt))
                        err = ifcreate(fdDep, tgt)
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                } else {
@@ -741,29 +732,31 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        if hshPrev != "" {
                                _, err = fd.Seek(0, io.SeekStart)
                                if err != nil {
+                                       err = ErrLine(err)
                                        goto Finish
                                }
                                hsh, err = fileHash(fd)
                                if err != nil {
+                                       err = ErrLine(err)
                                        goto Finish
                                }
                                if hsh == hshPrev {
                                        tracef(CDebug, "%s has same hash, not renaming", tgtOrig)
-                                       err = os.Remove(fd.Name())
+                                       err = ErrLine(os.Remove(fd.Name()))
                                        if err != nil {
                                                goto Finish
                                        }
-                                       err = os.Chtimes(path.Join(cwdOrig, tgt), finished, finished)
+                                       err = ErrLine(os.Chtimes(path.Join(cwdOrig, tgt), finished, finished))
                                        if err != nil {
                                                goto Finish
                                        }
                                        if !NoSync {
-                                               err = syncDir(cwdOrig)
+                                               err = ErrLine(syncDir(cwdOrig))
                                                if err != nil {
                                                        goto Finish
                                                }
                                        }
-                                       err = depWrite(fdDep, cwdOrig, tgt, hshPrev)
+                                       err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hshPrev))
                                        if err != nil {
                                                goto Finish
                                        }
@@ -771,22 +764,22 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                                }
                        }
                        if !NoSync {
-                               err = fd.Sync()
+                               err = ErrLine(fd.Sync())
                                if err != nil {
                                        goto Finish
                                }
                        }
-                       err = os.Rename(fd.Name(), path.Join(cwdOrig, tgt))
+                       err = ErrLine(os.Rename(fd.Name(), path.Join(cwdOrig, tgt)))
                        if err != nil {
                                goto Finish
                        }
                        if !NoSync {
-                               err = syncDir(cwdOrig)
+                               err = ErrLine(syncDir(cwdOrig))
                                if err != nil {
                                        goto Finish
                                }
                        }
-                       err = depWrite(fdDep, cwdOrig, tgt, hsh)
+                       err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hsh))
                        if err != nil {
                                goto Finish
                        }
@@ -795,18 +788,18 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
        RecCommit:
                // Commit .rec
                if !NoSync {
-                       err = fdDep.Sync()
+                       err = ErrLine(fdDep.Sync())
                        if err != nil {
                                goto Finish
                        }
                }
                fdDepPath = path.Join(redoDir, tgt+DepSuffix)
-               err = os.Rename(fdDep.Name(), fdDepPath)
+               err = ErrLine(os.Rename(fdDep.Name(), fdDepPath))
                if err != nil {
                        goto Finish
                }
                if !NoSync {
-                       err = syncDir(redoDir)
+                       err = ErrLine(syncDir(redoDir))
                        if err != nil {
                                goto Finish
                        }
@@ -818,6 +811,7 @@ func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
                        depInfo, err := depRead(fdDepR)
                        fdDepR.Close()
                        if err != nil {
+                               err = ErrLine(err)
                                goto Finish
                        }
                        ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))