Refactor target paths, less CPU, less memory, more clarity

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 6644ac54695674cc8c8ad539a1e17ecadc37f7b5..e587e6aa88ced9193b503b94ed2302fb459fba46 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -86,9 +86,9 @@ func fileHash(fd *os.File) ([]byte, error) {
        return h.Sum(nil), nil
 }
 
-func depWrite(fdDep *os.File, cwd, tgt string, hsh []byte) error {
+func depWrite(fdDep *os.File, cwd string, tgt *Tgt, hsh []byte) error {
        tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
-       fd, err := os.Open(path.Join(cwd, tgt))
+       fd, err := os.Open(tgt.a)
        if err != nil {
                return ErrLine(err)
        }
@@ -108,30 +108,30 @@ func depWrite(fdDep *os.File, cwd, tgt string, hsh []byte) error {
        }
        fields := []recfile.Field{
                {Name: "Type", Value: DepTypeIfchange},
-               {Name: "Target", Value: tgt},
+               {Name: "Target", Value: tgt.RelTo(cwd)},
                {Name: "Hash", Value: hex.EncodeToString(hsh)},
        }
        fields = append(fields, inode.RecfileFields()...)
        return recfileWrite(fdDep, fields...)
 }
 
-func depsWrite(fdDep *os.File, tgts []string) error {
+func depsWrite(fdDep *os.File, tgts []*Tgt) error {
        if fdDep == nil {
                tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
        var err error
+       var cwd string
        for _, tgt := range tgts {
-               tgtAbs := mustAbs(tgt)
-               cwd := Cwd
+               cwd = Cwd
                if DepCwd != "" && Cwd != DepCwd {
                        cwd = DepCwd
                }
                tgtDir := path.Join(cwd, DirPrefix)
-               tgtRel := mustRel(tgtDir, tgtAbs)
-               if _, errStat := os.Stat(tgt); errStat == nil {
-                       err = ErrLine(depWrite(fdDep, tgtDir, tgtRel, nil))
+               if _, errStat := os.Stat(tgt.a); errStat == nil {
+                       err = ErrLine(depWrite(fdDep, tgtDir, tgt, nil))
                } else {
+                       tgtRel := tgt.RelTo(tgtDir)
                        tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
                        fields := []recfile.Field{
                                {Name: "Type", Value: DepTypeIfchange},
@@ -149,7 +149,7 @@ func depsWrite(fdDep *os.File, tgts []string) error {
 }
 
 type DepInfoIfchange struct {
-       tgt   string
+       tgt   *Tgt
        inode *Inode
        hash  []byte
 }
@@ -158,7 +158,7 @@ type DepInfo struct {
        build     string
        always    bool
        stamp     []byte
-       ifcreates []string
+       ifcreates []*Tgt
        ifchanges []DepInfoIfchange
 }
 
@@ -172,8 +172,8 @@ func mustHexDecode(s string) []byte {
 
 var missingBuild = errors.New(".rec missing Build:")
 
-func depRead(pth string) (*DepInfo, error) {
-       data, err := os.ReadFile(pth)
+func depRead(tgt *Tgt) (*DepInfo, error) {
+       data, err := os.ReadFile(tgt.Dep())
        if err != nil {
                return nil, err
        }
@@ -204,7 +204,8 @@ func depRead(pth string) (*DepInfo, error) {
                        if dep == "" {
                                return nil, ErrBadRecFormat
                        }
-                       depInfo.ifcreates = append(depInfo.ifcreates, dep)
+                       depInfo.ifcreates = append(depInfo.ifcreates,
+                               NewTgt(path.Join(tgt.h, dep)))
                case DepTypeIfchange:
                        dep := m["Target"]
                        if dep == "" {
@@ -217,7 +218,7 @@ func depRead(pth string) (*DepInfo, error) {
                        }
                        hsh := mustHexDecode(m["Hash"])
                        depInfo.ifchanges = append(depInfo.ifchanges, DepInfoIfchange{
-                               tgt: dep, inode: inode, hash: hsh,
+                               tgt: NewTgt(path.Join(tgt.h, dep)), inode: inode, hash: hsh,
                        })
                case DepTypeStamp:
                        hsh := m["Hash"]
@@ -232,6 +233,29 @@ func depRead(pth string) (*DepInfo, error) {
        return &depInfo, nil
 }
 
+func depReadOnlyIfchanges(pth string) (ifchanges []string, err error) {
+       data, err := os.ReadFile(pth)
+       if err != nil {
+               return
+       }
+       r := recfile.NewReader(bytes.NewReader(data))
+       var m map[string]string
+       for {
+               m, err = r.NextMap()
+               if err != nil {
+                       if errors.Is(err, io.EOF) {
+                               err = nil
+                               break
+                       }
+                       return
+               }
+               if m["Type"] == DepTypeIfchange {
+                       ifchanges = append(ifchanges, m["Target"])
+               }
+       }
+       return
+}
+
 func depReadBuild(pth string) (string, error) {
        fd, err := os.Open(pth)
        if err != nil {