]> Cypherpunks.ru repositories - goredo.git/blobdiff - dep.go
Collapse lines
[goredo.git] / dep.go
diff --git a/dep.go b/dep.go
index 0c5b6348740393340435a7c81a3d9c85b5274324..4d57c917b3e5fe75f360653030e754b4d081ba77 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,22 +21,28 @@ package main
 
 import (
        "bufio"
+       "bytes"
        "encoding/hex"
        "errors"
-       "fmt"
        "io"
+       "log"
        "os"
        "path"
-       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
-       "golang.org/x/sys/unix"
        "lukechampine.com/blake3"
 )
 
-var DirPrefix string
+var (
+       DirPrefix string
+       DepCwd    string
 
-func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
+       ErrBadRecFormat = errors.New("invalid format of .rec")
+       InodeCache      = make(map[string][]*Inode)
+       HashCache       = make(map[string][]Hash)
+)
+
+func recfileWrite(fdDep io.StringWriter, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
                return err
@@ -48,7 +54,7 @@ func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
 }
 
 func ifcreate(fdDep *os.File, tgt string) error {
-       trace(CDebug, "ifcreate: %s <- %s", fdDep.Name(), tgt)
+       tracef(CDebug, "ifcreate: %s <- %s", fdDep.Name(), tgt)
        return recfileWrite(
                fdDep,
                recfile.Field{Name: "Type", Value: DepTypeIfcreate},
@@ -57,122 +63,137 @@ func ifcreate(fdDep *os.File, tgt string) error {
 }
 
 func always(fdDep *os.File) error {
-       trace(CDebug, "always: %s", fdDep.Name())
+       tracef(CDebug, "always: %s", fdDep.Name())
        return recfileWrite(fdDep, recfile.Field{Name: "Type", Value: DepTypeAlways})
 }
 
 func stamp(fdDep, src *os.File) error {
-       var hsh string
-       hsh, err := fileHash(os.Stdin)
+       hsh, err := fileHash(src)
        if err != nil {
                return err
        }
-       trace(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
+       tracef(CDebug, "stamp: %s <- %s", fdDep.Name(), hsh)
        return recfileWrite(
                fdDep,
                recfile.Field{Name: "Type", Value: DepTypeStamp},
-               recfile.Field{Name: "Hash", Value: hsh},
+               recfile.Field{Name: "Hash", Value: hsh.String()},
        )
 }
 
-func fileCtime(fd *os.File) (string, error) {
-       var stat unix.Stat_t
-       if err := unix.Fstat(int(fd.Fd()), &stat); err != nil {
-               return "", err
-       }
-       sec, nsec := stat.Ctim.Unix()
-       return fmt.Sprintf("%d.%d", sec, nsec), nil
-}
-
-func fileHash(fd *os.File) (string, error) {
-       h := blake3.New(32, nil)
+func fileHash(fd *os.File) (Hash, error) {
+       h := blake3.New(HashLen, nil)
        if _, err := io.Copy(h, bufio.NewReader(fd)); err != nil {
                return "", err
        }
-       return hex.EncodeToString(h.Sum(nil)), nil
+       return Hash(h.Sum(nil)), nil
 }
 
-func writeDep(fdDep *os.File, cwd, tgt string) error {
-       trace(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
-       fd, err := os.Open(path.Join(cwd, tgt))
+func depWrite(fdDep *os.File, cwd string, tgt *Tgt, hsh Hash) error {
+       tracef(CDebug, "ifchange: %s <- %s", fdDep.Name(), tgt)
+       fd, err := os.Open(tgt.a)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
        defer fd.Close()
-       fi, err := fd.Stat()
+       inode, isDir, err := inodeFromFileByFd(fd)
        if err != nil {
-               return err
+               return ErrLine(err)
        }
-       if fi.IsDir() {
+       if isDir {
                return nil
        }
-       ts, err := fileCtime(fd)
-       if err != nil {
-               return err
+       if hsh == "" {
+               hsh, err = fileHash(fd)
+               if err != nil {
+                       return ErrLine(err)
+               }
        }
-       hsh, err := fileHash(fd)
-       if err != nil {
-               return err
+       fields := []recfile.Field{
+               {Name: "Type", Value: DepTypeIfchange},
+               {Name: "Target", Value: tgt.RelTo(cwd)},
+               {Name: "Hash", Value: hsh.String()},
        }
-       return recfileWrite(
-               fdDep,
-               recfile.Field{Name: "Type", Value: DepTypeIfchange},
-               recfile.Field{Name: "Target", Value: tgt},
-               recfile.Field{Name: "Ctime", Value: ts},
-               recfile.Field{Name: "Hash", Value: hsh},
-       )
+       fields = append(fields, inode.RecfileFields()...)
+       return recfileWrite(fdDep, fields...)
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func depsWrite(fdDep *os.File, tgts []*Tgt) error {
        if fdDep == nil {
-               trace(CDebug, "no opened fdDep: %s", tgts)
+               tracef(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
+       var err error
+       var cwd string
        for _, tgt := range tgts {
-               if _, err := os.Stat(tgt); err == nil {
-                       tgtAbs, err := filepath.Abs(tgt)
-                       if err != nil {
-                               panic(err)
-                       }
-                       tgtDir := path.Join(Cwd, DirPrefix)
-                       tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
-                       if err != nil {
-                               panic(err)
-                       }
-                       if err = writeDep(fdDep, tgtDir, tgtRel); err != nil {
-                               return err
-                       }
+               cwd = Cwd
+               if DepCwd != "" && Cwd != DepCwd {
+                       cwd = DepCwd
+               }
+               tgtDir := path.Join(cwd, DirPrefix)
+               if _, errStat := os.Stat(tgt.a); errStat == nil {
+                       err = ErrLine(depWrite(fdDep, tgtDir, tgt, ""))
                } else {
-                       trace(CDebug, "skipping dep record, can not stat: %s", tgt)
+                       tgtRel := tgt.RelTo(tgtDir)
+                       tracef(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
+                       fields := []recfile.Field{
+                               {Name: "Type", Value: DepTypeIfchange},
+                               {Name: "Target", Value: tgtRel},
+                       }
+                       inodeDummy := Inode{}
+                       fields = append(fields, inodeDummy.RecfileFields()...)
+                       err = ErrLine(recfileWrite(fdDep, fields...))
+               }
+               if err != nil {
+                       return err
                }
        }
        return nil
 }
 
+type DepInfoIfchange struct {
+       tgt   *Tgt
+       inode *Inode
+       hash  Hash
+}
+
 type DepInfo struct {
        build     string
        always    bool
-       stamp     string
-       ifcreates []string
-       ifchanges []map[string]string
+       stamp     Hash
+       ifcreates []*Tgt
+       ifchanges []DepInfoIfchange
+}
+
+func mustHashDecode(s string) Hash {
+       b, err := hex.DecodeString(s)
+       if err != nil {
+               log.Fatal(err)
+       }
+       return Hash(b)
 }
 
-func depRead(fdDep *os.File) (*DepInfo, error) {
-       r := recfile.NewReader(fdDep)
+var missingBuild = errors.New(".rec missing Build:")
+
+func depRead(tgt *Tgt) (*DepInfo, error) {
+       data, err := os.ReadFile(tgt.Dep())
+       if err != nil {
+               return nil, err
+       }
+       r := recfile.NewReader(bytes.NewReader(data))
        m, err := r.NextMap()
        if err != nil {
                return nil, err
        }
        depInfo := DepInfo{}
-       if b := m["Build"]; b == "" {
-               return nil, errors.New(".dep missing Build:")
-       } else {
-               depInfo.build = b
+       b := m["Build"]
+       if b == "" {
+               return nil, missingBuild
        }
+       depInfo.build = b
        for {
                m, err := r.NextMap()
                if err != nil {
-                       if err == io.EOF {
+                       if errors.Is(err, io.EOF) {
                                break
                        }
                        return nil, err
@@ -183,21 +204,100 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
                case DepTypeIfcreate:
                        dep := m["Target"]
                        if dep == "" {
-                               return nil, errors.New("invalid format of .dep")
+                               return nil, ErrBadRecFormat
                        }
-                       depInfo.ifcreates = append(depInfo.ifcreates, dep)
+                       depInfo.ifcreates = append(depInfo.ifcreates,
+                               NewTgt(path.Join(tgt.h, dep)))
                case DepTypeIfchange:
-                       delete(m, "Type")
-                       depInfo.ifchanges = append(depInfo.ifchanges, m)
+                       depRaw := m["Target"]
+                       if depRaw == "" {
+                               return nil, ErrBadRecFormat
+                       }
+                       inode, err := inodeFromRec(m)
+                       if err != nil {
+                               log.Print(err)
+                               return nil, ErrBadRecFormat
+                       }
+                       dep := NewTgt(path.Join(tgt.h, depRaw))
+
+                       cachedFound := false
+                       for _, cachedInode := range InodeCache[dep.a] {
+                               if inode.Equals(cachedInode) {
+                                       inode = cachedInode
+                                       cachedFound = true
+                                       break
+                               }
+                       }
+                       if InodeCache != nil && !cachedFound {
+                               InodeCache[dep.a] = append(InodeCache[dep.a], inode)
+                       }
+
+                       hsh := mustHashDecode(m["Hash"])
+                       cachedFound = false
+                       for _, cachedHash := range HashCache[dep.a] {
+                               if hsh == cachedHash {
+                                       hsh = cachedHash
+                                       cachedFound = true
+                                       break
+                               }
+                       }
+                       if HashCache != nil && !cachedFound {
+                               HashCache[dep.a] = append(HashCache[dep.a], hsh)
+                       }
+
+                       depInfo.ifchanges = append(depInfo.ifchanges, DepInfoIfchange{
+                               tgt: dep, inode: inode, hash: hsh,
+                       })
                case DepTypeStamp:
                        hsh := m["Hash"]
                        if hsh == "" {
-                               return nil, errors.New("invalid format of .dep")
+                               return nil, ErrBadRecFormat
                        }
-                       depInfo.stamp = hsh
+                       depInfo.stamp = mustHashDecode(hsh)
                default:
-                       return nil, errors.New("invalid format of .dep")
+                       return nil, ErrBadRecFormat
                }
        }
        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 {
+               return "", err
+       }
+       r := recfile.NewReader(fd)
+       m, err := r.NextMap()
+       fd.Close()
+       if err != nil {
+               return "", err
+       }
+       build := m["Build"]
+       if build == "" {
+               err = missingBuild
+       }
+       return build, err
+}