X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ood.go;h=912b6c61b4ce62c5e93ba9de78a3d17fd8283eff;hb=7eabb39c54b96fca347a0576f501239d89bd8ec6;hp=4189ed459cae740df414d766ac3e6e8ceaedb675;hpb=bc7701e7a4f95cee680e0736ec3e68a8b0b5c09f;p=goredo.git diff --git a/ood.go b/ood.go index 4189ed4..912b6c6 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-2021 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 @@ -22,13 +22,17 @@ package main import ( "errors" "fmt" - "io" "os" "path" "path/filepath" "strings" +) - "go.cypherpunks.ru/recfile" +const ( + DepTypeIfcreate = "ifcreate" + DepTypeIfchange = "ifchange" + DepTypeAlways = "always" + DepTypeStamp = "stamp" ) type TgtErr struct { @@ -42,6 +46,14 @@ func (e TgtErr) 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) @@ -56,159 +68,81 @@ func isSrc(cwd, tgt string) bool { if _, err := os.Stat(path.Join(d, f)); err != nil { return false } + if _, err := os.Stat(path.Join(d, f+".do")); err == nil { + return false + } if _, err := os.Stat(path.Join(d, RedoDir, f+DepSuffix)); err == nil { return false } return true } -func isBuiltNow(fdDep *os.File) (bool, *recfile.Reader, error) { - r := recfile.NewReader(fdDep) - m, err := r.NextMap() - if err != nil { - return false, nil, err - } - if m["Build"] == "" { - return false, r, errors.New(".dep missing Build:") - } - return m["Build"] == BuildUUID, r, nil -} - -func rebuildStamped(cwd, tgt, depPath string) (string, error) { - relTgt, err := filepath.Rel(Cwd, path.Join(cwd, tgt)) - if err != nil { - panic(err) - } - errs := make(chan error, 1) - if err = runScript(relTgt, errs); err != nil { - return "", err - } - if err = <-errs; !isOkRun(err) { - return "", errors.New("build failed") - } - fdDep, err := os.Open(depPath) - if err != nil { - return "", err - } - defer fdDep.Close() - builtNow, r, err := isBuiltNow(fdDep) - if err != nil { - return "", err - } - if !builtNow { - return "", errors.New("is not built") - } - var stampTheir string - for { - m, err := r.NextMap() - if err != nil { - if err == io.EOF { - break - } - return "", err - } - if m["Type"] == "stamp" { - stampTheir = m["Hash"] - break - } - } - return stampTheir, nil -} - -func isOOD(cwd, tgt string, level int) (bool, error) { - tgtOrig := tgt +func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, error) { indent := strings.Repeat(". ", level) trace(CDebug, "ood: %s%s checking", indent, tgtOrig) - cwd, tgt = cwdAndTgt(path.Join(cwd, tgt)) + cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig)) depPath := path.Join(cwd, RedoDir, tgt+DepSuffix) 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() - ood := false - - builtNow, r, err := isBuiltNow(fdDep) + depInfo, err := depRead(fdDep) + fdDep.Close() if err != nil { return true, TgtErr{tgtOrig, err} } - if builtNow { + + if depInfo.build == BuildUUID { trace(CDebug, "ood: %s%s -> already built", indent, tgtOrig) return false, nil } + ood := false - var stampOur string - ifcreates := []map[string]string{} - ifchanges := []map[string]string{} - for { - m, err := r.NextMap() - if err != nil { - if err == io.EOF { - break - } - return true, TgtErr{tgtOrig, err} - } - switch m["Type"] { - case "always": - trace(CDebug, "ood: %s%s -> always", indent, tgtOrig) + 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) ood = true - case "ifcreate": - ifcreates = append(ifcreates, m) - case "ifchange": - ifchanges = append(ifchanges, m) - case "stamp": - stampOur = m["Hash"] - trace(CDebug, "ood: %s%s -> stamped: %s", indent, tgtOrig, stampOur) - default: - return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")} + goto Done } } - if ood { - goto StampCheck - } - for _, m := range ifcreates { - theirTgt := m["Target"] - if theirTgt == "" { - return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")} + for _, m := range depInfo.ifchanges { + dep := m["Target"] + if dep == "" { + return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep: missing Target")} } - if _, err = os.Stat(path.Join(cwd, theirTgt)); err == nil { - trace(CDebug, "ood: %s%s -> created", indent, tgtOrig) - ood = true - goto StampCheck + theirInode, err := inodeFromRec(m) + if err != nil { + return ood, TgtErr{tgtOrig, fmt.Errorf("invalid format of .dep: %v", err)} } - } - - for _, m := range ifchanges { - dep := m["Target"] - theirTs := m["Ctime"] theirHsh := m["Hash"] - if dep == "" || theirTs == "" { - return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")} - } trace(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep) + fd, err := os.Open(path.Join(cwd, dep)) if err != nil { if os.IsNotExist(err) { trace(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep) ood = true - goto StampCheck + goto Done } return ood, TgtErr{tgtOrig, err} } defer fd.Close() - ts, err := fileCtime(fd) + + inode, err := inodeFromFile(fd) if err != nil { return ood, TgtErr{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 inode.Size != theirInode.Size { + trace(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep) ood = true - goto StampCheck + goto Done + } + if InodeTrust && inode.Equals(theirInode) { + trace(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep) } else { + trace(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep) hsh, err := fileHash(fd) if err != nil { return ood, TgtErr{tgtOrig, err} @@ -216,11 +150,12 @@ func isOOD(cwd, tgt string, level int) (bool, error) { if theirHsh != hsh { trace(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep) ood = true - goto StampCheck + goto Done } trace(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep) } - fd.Close() + fd.Close() // optimization not to hold it for long + if dep == tgt { trace(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep) continue @@ -229,30 +164,25 @@ func isOOD(cwd, tgt string, level int) (bool, error) { trace(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep) continue } - depOod, err := isOOD(cwd, dep, level+1) + + if _, ok := seen[cwdMustRel(cwd, dep)]; ok { + trace(CDebug, "ood: %s%s -> %s: was always built", indent, tgtOrig, dep) + continue + } + + depOod, err := isOOD(cwd, dep, level+1, seen) if err != nil { return ood, TgtErr{tgtOrig, err} } if depOod { trace(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) } -StampCheck: - if ood && stampOur != "" { - trace(CDebug, "ood: %s%s run, because stamped", indent, tgtOrig) - stampTheir, err := rebuildStamped(cwd, tgt, depPath) - if err != nil { - return true, TgtErr{tgtOrig, err} - } - trace(CDebug, "ood: %s%s -> stamp: %s %s", indent, tgtOrig, stampOur, stampTheir) - if stampOur == stampTheir { - ood = false - } - } +Done: trace(CDebug, "ood: %s%s: %v", indent, tgtOrig, ood) return ood, nil }