]> Cypherpunks.ru repositories - goredo.git/blobdiff - ood.go
Remove useless check
[goredo.git] / ood.go
diff --git a/ood.go b/ood.go
index 25253ced2eaac52a57f49ba23f47fac50c91de35..5dc543f56aa263d821b33dc03a4d8fa30d66ccf7 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -20,13 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+       "bytes"
        "errors"
        "fmt"
        "io"
+       "io/fs"
        "log"
        "os"
        "path"
-       "path/filepath"
        "strings"
 
        "golang.org/x/sys/unix"
@@ -47,8 +48,8 @@ var (
        FdOODTgts     *os.File
        FdOODTgtsLock *os.File
 
-       OODCache        map[string]bool = make(map[string]bool)
-       FileExistsCache map[string]bool = make(map[string]bool)
+       OODCache        = make(map[string]bool)
+       FileExistsCache = make(map[string]bool)
 
        ErrMissingTarget = errors.New("invalid format of .rec: missing Target")
 )
@@ -62,7 +63,7 @@ func FileExists(p string) bool {
                FileExistsCache[p] = true
                return true
        }
-       if os.IsNotExist(err) {
+       if errors.Is(err, fs.ErrNotExist) {
                FileExistsCache[p] = false
        }
        return false
@@ -79,23 +80,6 @@ func (e TgtError) Error() string {
        return fmt.Sprintf("%s: %s", e.Tgt, e.Err)
 }
 
-func cwdMustRel(paths ...string) string {
-       rel, err := filepath.Rel(Cwd, path.Join(paths...))
-       if err != nil {
-               panic(err)
-       }
-       return rel
-}
-
-func cwdAndTgt(tgt string) (string, string) {
-       cwd, tgt := path.Split(tgt)
-       cwd, err := filepath.Abs(cwd)
-       if err != nil {
-               panic(err)
-       }
-       return cwd, tgt
-}
-
 func isSrc(cwd, tgt string) bool {
        d, f := path.Split(path.Join(cwd, tgt))
        if !FileExists(path.Join(d, f)) {
@@ -113,16 +97,8 @@ func isSrc(cwd, tgt string) bool {
 func isOODByBuildUUID(cwd, tgtOrig string) bool {
        cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig))
        depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
-       fdDep, err := os.Open(depPath)
-       if err != nil {
-               return true
-       }
-       depInfo, err := depRead(fdDep)
-       fdDep.Close()
-       if err != nil || depInfo.build != BuildUUID {
-               return true
-       }
-       return false
+       build, err := depReadBuild(depPath)
+       return err != nil || build != BuildUUID
 }
 
 func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, error) {
@@ -135,16 +111,22 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
                return ood, nil
        }
        depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
-       fdDep, err := os.Open(depPath)
-       if err != nil {
-               tracef(CDebug, "ood: %s%s -> no dep: %s", indent, tgtOrig, depPath)
-               OODCache[path.Join(cwd, tgt)] = true
-               return true, nil
-       }
-       depInfo, err := depRead(fdDep)
-       fdDep.Close()
+       depInfo, err := depRead(depPath)
        if err != nil {
-               return true, TgtError{tgtOrig, err}
+               if errors.Is(err, fs.ErrNotExist) {
+                       if isSrc(cwd, tgt) {
+                               ood = false
+                               tracef(CDebug, "ood: %s%s -> is source", indent, tgtOrig)
+                       } else {
+                               ood = true
+                               tracef(CDebug, "ood: %s%s -> no dep: %s", indent, tgtOrig, depPath)
+                       }
+                       OODCache[path.Join(cwd, tgt)] = ood
+                       return ood, nil
+               }
+               if err != nil {
+                       return true, TgtError{tgtOrig, ErrLine(err)}
+               }
        }
 
        if depInfo.build == BuildUUID {
@@ -166,91 +148,82 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
                }
        }
 
-       for _, m := range depInfo.ifchanges {
-               dep := m["Target"]
-               if dep == "" {
-                       return ood, TgtError{tgtOrig, ErrMissingTarget}
-               }
-               theirInode, err := inodeFromRec(m)
-               if err != nil {
-                       return ood, TgtError{tgtOrig, fmt.Errorf("invalid format of .rec: %w", err)}
-               }
-               theirHsh := m["Hash"]
-               tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
-               ood, cached = OODCache[path.Join(cwd, dep)]
+       for _, dep := range depInfo.ifchanges {
+               tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep.tgt)
+               ood, cached = OODCache[path.Join(cwd, dep.tgt)]
                if cached {
-                       tracef(CDebug, "ood: %s%s -> %s: cached: %v", indent, tgtOrig, dep, ood)
+                       tracef(CDebug, "ood: %s%s -> %s: cached: %v", indent, tgtOrig, dep.tgt, ood)
                        if ood {
                                goto Done
                        }
                        continue
                }
 
-               inode, err := inodeFromFileByPath(path.Join(cwd, dep))
+               inode, err := inodeFromFileByPath(path.Join(cwd, dep.tgt))
                if err != nil {
-                       if os.IsNotExist(err) {
-                               tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
+                       if errors.Is(err, fs.ErrNotExist) {
+                               tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep.tgt)
                                ood = true
-                               OODCache[path.Join(cwd, dep)] = ood
+                               OODCache[path.Join(cwd, dep.tgt)] = ood
                                goto Done
                        }
-                       return ood, TgtError{tgtOrig, err}
+                       return ood, TgtError{tgtOrig, ErrLine(err)}
                }
 
-               if inode.Size != theirInode.Size {
-                       tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep)
+               if inode.Size != dep.inode.Size {
+                       tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep.tgt)
                        ood = true
-                       OODCache[path.Join(cwd, dep)] = ood
+                       OODCache[path.Join(cwd, dep.tgt)] = ood
                        goto Done
                }
-               if InodeTrust != InodeTrustNone && inode.Equals(theirInode) {
-                       tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep)
+               if InodeTrust != InodeTrustNone && inode.Equals(dep.inode) {
+                       tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep.tgt)
                } else {
-                       tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
-                       fd, err := os.Open(path.Join(cwd, dep))
+                       tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep.tgt)
+                       fd, err := os.Open(path.Join(cwd, dep.tgt))
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
                        hsh, err := fileHash(fd)
                        fd.Close()
                        if err != nil {
-                               return ood, TgtError{tgtOrig, err}
+                               return ood, TgtError{tgtOrig, ErrLine(err)}
                        }
-                       if theirHsh != hsh {
-                               tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep)
+                       if !bytes.Equal(dep.hash, hsh) {
+                               tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep.tgt)
                                ood = true
-                               OODCache[path.Join(cwd, dep)] = ood
+                               OODCache[path.Join(cwd, dep.tgt)] = ood
                                goto Done
                        }
-                       tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
+                       tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep.tgt)
                }
 
-               if dep == tgt {
-                       tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep)
+               if dep.tgt == tgt {
+                       tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep.tgt)
                        continue
                }
-               if isSrc(cwd, dep) {
-                       tracef(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep)
-                       OODCache[path.Join(cwd, dep)] = false
+               if isSrc(cwd, dep.tgt) {
+                       tracef(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep.tgt)
+                       OODCache[path.Join(cwd, dep.tgt)] = false
                        continue
                }
 
-               if _, ok := seen[cwdMustRel(cwd, dep)]; ok {
-                       tracef(CDebug, "ood: %s%s -> %s: was always built", indent, tgtOrig, dep)
-                       OODCache[path.Join(cwd, dep)] = false
+               if _, ok := seen[cwdMustRel(cwd, dep.tgt)]; ok {
+                       tracef(CDebug, "ood: %s%s -> %s: was always built", indent, tgtOrig, dep.tgt)
+                       OODCache[path.Join(cwd, dep.tgt)] = false
                        continue
                }
 
-               depOod, err := isOODWithTrace(cwd, dep, level+1, seen)
+               depOOD, err := isOODWithTrace(cwd, dep.tgt, level+1, seen)
                if err != nil {
                        return ood, TgtError{tgtOrig, err}
                }
-               if depOod {
-                       tracef(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep)
+               if depOOD {
+                       tracef(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep.tgt)
                        ood = true
                        goto Done
                }
-               tracef(CDebug, "ood: %s%s -> %s: !ood", indent, tgtOrig, dep)
+               tracef(CDebug, "ood: %s%s -> %s: !ood", indent, tgtOrig, dep.tgt)
        }
 
 Done:
@@ -264,11 +237,9 @@ func isOODWithTrace(
        level int,
        seen map[string]struct{},
 ) (bool, error) {
-       p, err := filepath.Abs(path.Join(cwd, tgtOrig))
-       if err != nil {
-               panic(err)
-       }
+       p := mustAbs(path.Join(cwd, tgtOrig))
        _, ood := OODTgts[p]
+       var err error
        if ood {
                if !isOODByBuildUUID(cwd, tgtOrig) {
                        tracef(
@@ -295,17 +266,17 @@ RecordOODTgt:
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err = FdOODTgts.Seek(0, io.SeekEnd); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if _, err := FdOODTgts.WriteString(p + "\x00"); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        return true, nil
 }
@@ -317,13 +288,13 @@ func oodTgtsClear() {
                Whence: io.SeekStart,
        }
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        if err = FdOODTgts.Truncate(0); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        flock.Type = unix.F_UNLCK
        if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 }