X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ood.go;h=6e9043cc0762e0962a8c28df2c82d9238a56f5fb;hb=19b13ea1334d377dd9c6a36ea70c9141b8fd447d;hp=9b6ebbab03b294b2d82f648e01098aa4747b3a29;hpb=6ef14f9de82e4a61532b84b149bde0c953d58a04;p=goredo.git diff --git a/ood.go b/ood.go index 9b6ebba..6e9043c 100644 --- a/ood.go +++ b/ood.go @@ -1,6 +1,6 @@ /* -goredo -- redo implementation on pure Go -Copyright (C) 2020 Sergey Matveev +goredo -- djb's redo implementation on pure Go +Copyright (C) 2020-2022 Sergey Matveev 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 @@ -23,12 +23,13 @@ import ( "errors" "fmt" "io" + "log" "os" "path" "path/filepath" "strings" - "go.cypherpunks.ru/recfile" + "golang.org/x/sys/unix" ) const ( @@ -36,16 +37,45 @@ const ( DepTypeIfchange = "ifchange" DepTypeAlways = "always" DepTypeStamp = "stamp" + + EnvOODTgtsFd = "REDO_OOD_TGTS_FD" + EnvOODTgtsLockFd = "REDO_OOD_TGTS_LOCK_FD" +) + +var ( + OODTgts map[string]struct{} + FdOODTgts *os.File + FdOODTgtsLock *os.File + + OODCache map[string]bool = make(map[string]bool) + FileExistsCache map[string]bool = make(map[string]bool) + + ErrMissingTarget = errors.New("invalid format of .rec: missing Target") ) -type TgtErr struct { +func FileExists(p string) bool { + if exists, known := FileExistsCache[p]; known { + return exists + } + _, err := os.Stat(p) + if err == nil { + FileExistsCache[p] = true + return true + } + if os.IsNotExist(err) { + FileExistsCache[p] = false + } + return false +} + +type TgtError struct { Tgt string Err error } -func (e TgtErr) Unwrap() error { return e.Err } +func (e TgtError) Unwrap() error { return e.Err } -func (e TgtErr) Error() string { +func (e TgtError) Error() string { return fmt.Sprintf("%s: %s", e.Tgt, e.Err) } @@ -68,244 +98,232 @@ func cwdAndTgt(tgt string) (string, string) { func isSrc(cwd, tgt string) bool { d, f := path.Split(path.Join(cwd, tgt)) - if _, err := os.Stat(path.Join(d, f)); err != nil { + if !FileExists(path.Join(d, f)) { return false } - if _, err := os.Stat(path.Join(d, RedoDir, f+DepSuffix)); err == nil { + if FileExists(path.Join(d, f+".do")) { + return false + } + if FileExists(path.Join(d, RedoDir, f+DepSuffix)) { return false } return true } -type DepInfo struct { - build string - always bool - stamp string - stampSame bool - ifcreates []string - ifchanges []map[string]string -} - -func depRead(fdDep *os.File) (*DepInfo, error) { - r := recfile.NewReader(fdDep) - m, err := r.NextMap() +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 nil, err + return true } - depInfo := DepInfo{} - if b := m["Build"]; b == "" { - return nil, errors.New(".dep missing Build:") - } else { - depInfo.build = b - } - for { - m, err := r.NextMap() - if err != nil { - if err == io.EOF { - break - } - return nil, err - } - switch m["Type"] { - case DepTypeAlways: - depInfo.always = true - case DepTypeIfcreate: - dep := m["Target"] - if dep == "" { - return nil, errors.New("invalid format of .dep") - } - depInfo.ifcreates = append(depInfo.ifcreates, dep) - case DepTypeIfchange: - delete(m, "Type") - depInfo.ifchanges = append(depInfo.ifchanges, m) - case DepTypeStamp: - hsh := m["Hash"] - if hsh == "" { - return nil, errors.New("invalid format of .dep") - } - depInfo.stamp = hsh - depInfo.stampSame = m["Same"] == "true" - default: - return nil, errors.New("invalid format of .dep") - } + depInfo, err := depRead(fdDep) + fdDep.Close() + if err != nil || depInfo.build != BuildUUID { + return true } - return &depInfo, nil + return false } -func rebuildStamped(cwd, tgt, depPath, stampPrev string) (bool, error) { - relTgt := cwdMustRel(cwd, tgt) - errs := make(chan error, 1) - if err := runScript(relTgt, errs, stampPrev); err != nil { - return false, err - } - if err := <-errs; !isOkRun(err) { - return false, errors.New("build failed") +func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, error) { + indent := strings.Repeat(". ", level) + tracef(CDebug, "ood: %s%s checking", indent, tgtOrig) + cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig)) + ood, cached := OODCache[path.Join(cwd, tgt)] + if cached { + tracef(CDebug, "ood: %s%s -> cached: %v", indent, tgtOrig, ood) + return ood, nil } + depPath := path.Join(cwd, RedoDir, tgt+DepSuffix) fdDep, err := os.Open(depPath) if err != nil { - return false, err + tracef(CDebug, "ood: %s%s -> no dep: %s", indent, tgtOrig, depPath) + OODCache[path.Join(cwd, tgt)] = true + return true, nil } - defer fdDep.Close() depInfo, err := depRead(fdDep) + fdDep.Close() if err != nil { - return false, err - } - if depInfo.build != BuildUUID { - return false, errors.New("is not built") - } - return depInfo.stampSame, nil -} - -func formDepPath(cwd, tgt string) string { - cwd, tgt = cwdAndTgt(path.Join(cwd, tgt)) - return path.Join(cwd, RedoDir, tgt+DepSuffix) -} - -func isOOD(cwd, tgtOrig string, level int, depInfo *DepInfo) (bool, error) { - indent := strings.Repeat(". ", level) - trace(CDebug, "ood: %s%s checking", indent, tgtOrig) - cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig)) - depPath := formDepPath(cwd, tgt) - if depInfo == nil { - fdDep, err := os.Open(depPath) - if err != nil { - trace(CDebug, "ood: %s%s -> no dep: %s", indent, tgtOrig, depPath) - return true, nil - } - defer fdDep.Close() - depInfo, err = depRead(fdDep) - if err != nil { - return true, TgtErr{tgtOrig, err} - } + return true, TgtError{tgtOrig, err} } if depInfo.build == BuildUUID { - trace(CDebug, "ood: %s%s -> already built", indent, tgtOrig) + tracef(CDebug, "ood: %s%s -> already built", indent, tgtOrig) + OODCache[path.Join(cwd, tgt)] = false return false, nil } - ood := depInfo.always - if ood { - goto StampCheck + if !FileExists(path.Join(cwd, tgt)) { + tracef(CDebug, "ood: %s%s -> non-existent", indent, tgtOrig) + OODCache[path.Join(cwd, tgt)] = true + return true, nil } for _, dep := range depInfo.ifcreates { - if _, err := os.Stat(path.Join(cwd, dep)); err == nil { - trace(CDebug, "ood: %s%s -> %s created", indent, tgtOrig, dep) + if FileExists(path.Join(cwd, dep)) { + tracef(CDebug, "ood: %s%s -> %s created", indent, tgtOrig, dep) ood = true - goto StampCheck + goto Done } } for _, m := range depInfo.ifchanges { dep := m["Target"] - theirTs := m["Ctime"] + 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"] - if dep == "" || theirTs == "" { - return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")} + tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep) + ood, cached = OODCache[path.Join(cwd, dep)] + if cached { + tracef(CDebug, "ood: %s%s -> %s: cached: %v", indent, tgtOrig, dep, ood) + if ood { + goto Done + } + continue } - trace(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep) - fd, err := os.Open(path.Join(cwd, dep)) + inode, err := inodeFromFileByPath(path.Join(cwd, dep)) if err != nil { if os.IsNotExist(err) { - trace(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep) + tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep) ood = true - goto StampCheck + OODCache[path.Join(cwd, dep)] = ood + goto Done } - return ood, TgtErr{tgtOrig, err} + return ood, TgtError{tgtOrig, err} } - defer fd.Close() - var depDepInfo *DepInfo - if !(dep == tgt || isSrc(cwd, dep)) { - trace(CDebug, "ood: %s%s -> %s: prereading .dep", indent, tgtOrig, dep) - depFdDep, err := os.Open(formDepPath(cwd, dep)) - if err != nil { - return ood, TgtErr{path.Join(tgtOrig, dep), err} - } - defer depFdDep.Close() - depDepInfo, err = depRead(depFdDep) - if err != nil { - return ood, TgtErr{path.Join(tgtOrig, dep), err} - } + if inode.Size != theirInode.Size { + tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep) + ood = true + OODCache[path.Join(cwd, dep)] = ood + goto Done } - - if depDepInfo != nil && depDepInfo.build == BuildUUID { - trace( - CDebug, "ood: %s%s -> %s: .dep says build is same", - indent, tgtOrig, dep, - ) - if !depDepInfo.stampSame { - trace( - CDebug, "ood: %s%s -> %s: .dep says stamp is not same", - indent, tgtOrig, dep, - ) - ood = true - return ood, nil + if InodeTrust != InodeTrustNone && inode.Equals(theirInode) { + tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep) + } else { + tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep) + fd, err := os.Open(path.Join(cwd, dep)) + if err != nil { + return ood, TgtError{tgtOrig, err} } - trace( - CDebug, "ood: %s%s -> %s: .dep says stamp is same", - indent, tgtOrig, dep, - ) - continue - } - - if depDepInfo == nil || !depDepInfo.always && depDepInfo.stamp == "" { - ts, err := fileCtime(fd) + hsh, err := fileHash(fd) + fd.Close() if err != nil { - return ood, TgtErr{tgtOrig, err} + return ood, TgtError{tgtOrig, err} } - if theirTs == ts { - trace(CDebug, "ood: %s%s -> %s: same ctime", indent, tgtOrig, dep) - } else if NoHash || theirHsh == "" { - trace(CDebug, "ood: %s%s -> %s: ctime differs", indent, tgtOrig, dep) + if theirHsh != hsh { + tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep) ood = true - goto StampCheck - } else { - hsh, err := fileHash(fd) - if err != nil { - return ood, TgtErr{tgtOrig, err} - } - if theirHsh != hsh { - trace(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep) - ood = true - goto StampCheck - } - trace(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep) + OODCache[path.Join(cwd, dep)] = ood + goto Done } + tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep) } if dep == tgt { - trace(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep) + tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep) continue } if isSrc(cwd, dep) { - trace(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep) + tracef(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep) + OODCache[path.Join(cwd, dep)] = false continue } - depOod, err := isOOD(cwd, dep, level+1, depDepInfo) + 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 + continue + } + + depOod, err := isOODWithTrace(cwd, dep, level+1, seen) if err != nil { - return ood, TgtErr{tgtOrig, err} + return ood, TgtError{tgtOrig, err} } if depOod { - trace(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep) + tracef(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep) ood = true - goto StampCheck + goto Done } - trace(CDebug, "ood: %s%s -> %s: !ood", indent, tgtOrig, dep) + tracef(CDebug, "ood: %s%s -> %s: !ood", indent, tgtOrig, dep) } -StampCheck: - if ood && depInfo.stamp != "" { - trace(CDebug, "ood: %s%s run, because stamped", indent, tgtOrig) - stampSame, err := rebuildStamped(cwd, tgt, depPath, depInfo.stamp) - if err != nil { - return true, TgtErr{tgtOrig, err} +Done: + tracef(CDebug, "ood: %s%s: %v", indent, tgtOrig, ood) + OODCache[path.Join(cwd, tgt)] = ood + return ood, nil +} + +func isOODWithTrace( + cwd, tgtOrig string, + level int, + seen map[string]struct{}, +) (bool, error) { + p, err := filepath.Abs(path.Join(cwd, tgtOrig)) + if err != nil { + panic(err) + } + _, ood := OODTgts[p] + if ood { + if !isOODByBuildUUID(cwd, tgtOrig) { + tracef( + CDebug, + "ood: %s%s -> already built", + strings.Repeat(". ", level), tgtOrig, + ) + return false, nil } - trace(CDebug, "ood: %s%s -> stamp: same: %v", indent, tgtOrig, stampSame) - ood = !stampSame + tracef( + CDebug, + "ood: %s%s true, external decision", + strings.Repeat(". ", level), tgtOrig, + ) + goto RecordOODTgt + } + ood, err = isOOD(cwd, tgtOrig, level, seen) + if !ood { + return ood, err + } +RecordOODTgt: + flock := unix.Flock_t{ + Type: unix.F_WRLCK, + Whence: io.SeekStart, + } + if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil { + log.Fatalln(err) + } + if _, err = FdOODTgts.Seek(0, io.SeekEnd); err != nil { + log.Fatalln(err) + } + if _, err := FdOODTgts.WriteString(p + "\x00"); err != nil { + log.Fatalln(err) + } + flock.Type = unix.F_UNLCK + if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil { + log.Fatalln(err) + } + return true, nil +} + +func oodTgtsClear() { + var err error + flock := unix.Flock_t{ + Type: unix.F_WRLCK, + Whence: io.SeekStart, + } + if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLKW, &flock); err != nil { + log.Fatalln(err) + } + if err = FdOODTgts.Truncate(0); err != nil { + log.Fatalln(err) + } + flock.Type = unix.F_UNLCK + if err = unix.FcntlFlock(FdOODTgtsLock.Fd(), unix.F_SETLK, &flock); err != nil { + log.Fatalln(err) } - trace(CDebug, "ood: %s%s: %v", indent, tgtOrig, ood) - return ood, nil }