X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ood.go;h=6e9043cc0762e0962a8c28df2c82d9238a56f5fb;hb=b2b1d51fb5968a6cfa86bf17c9f7d1d0b8a1cb2a;hp=7a315734287268d3f37c68fe1b82d0a91bc2579e;hpb=992b7b94dd2981b4848ba17317c462e6d875e417;p=goredo.git

diff --git a/ood.go b/ood.go
index 7a31573..6e9043c 100644
--- a/ood.go
+++ b/ood.go
@@ -47,9 +47,27 @@ var (
 	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")
 )
 
+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
@@ -80,13 +98,13 @@ 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, f+".do")); err == nil {
+	if FileExists(path.Join(d, f+".do")) {
 		return false
 	}
-	if _, err := os.Stat(path.Join(d, RedoDir, f+DepSuffix)); err == nil {
+	if FileExists(path.Join(d, RedoDir, f+DepSuffix)) {
 		return false
 	}
 	return true
@@ -111,10 +129,16 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 	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 {
 		tracef(CDebug, "ood: %s%s -> no dep: %s", indent, tgtOrig, depPath)
+		OODCache[path.Join(cwd, tgt)] = true
 		return true, nil
 	}
 	depInfo, err := depRead(fdDep)
@@ -125,16 +149,17 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 
 	if depInfo.build == BuildUUID {
 		tracef(CDebug, "ood: %s%s -> already built", indent, tgtOrig)
+		OODCache[path.Join(cwd, tgt)] = false
 		return false, nil
 	}
-	if _, err := os.Stat(path.Join(cwd, tgt)); err != nil && os.IsNotExist(err) {
+	if !FileExists(path.Join(cwd, tgt)) {
 		tracef(CDebug, "ood: %s%s -> non-existent", indent, tgtOrig)
+		OODCache[path.Join(cwd, tgt)] = true
 		return true, nil
 	}
-	ood := false
 
 	for _, dep := range depInfo.ifcreates {
-		if _, err := os.Stat(path.Join(cwd, dep)); err == nil {
+		if FileExists(path.Join(cwd, dep)) {
 			tracef(CDebug, "ood: %s%s -> %s created", indent, tgtOrig, dep)
 			ood = true
 			goto Done
@@ -152,12 +177,21 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 		}
 		theirHsh := m["Hash"]
 		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
+		}
 
 		inode, err := inodeFromFileByPath(path.Join(cwd, dep))
 		if err != nil {
 			if os.IsNotExist(err) {
 				tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
 				ood = true
+				OODCache[path.Join(cwd, dep)] = ood
 				goto Done
 			}
 			return ood, TgtError{tgtOrig, err}
@@ -166,6 +200,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 		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 InodeTrust != InodeTrustNone && inode.Equals(theirInode) {
@@ -184,6 +219,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 			if theirHsh != hsh {
 				tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep)
 				ood = true
+				OODCache[path.Join(cwd, dep)] = ood
 				goto Done
 			}
 			tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
@@ -195,11 +231,13 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 		}
 		if isSrc(cwd, dep) {
 			tracef(CDebug, "ood: %s%s -> %s: is source", indent, tgtOrig, dep)
+			OODCache[path.Join(cwd, dep)] = 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
 			continue
 		}
 
@@ -217,6 +255,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 
 Done:
 	tracef(CDebug, "ood: %s%s: %v", indent, tgtOrig, ood)
+	OODCache[path.Join(cwd, tgt)] = ood
 	return ood, nil
 }