]> Cypherpunks.ru repositories - goredo.git/blobdiff - ood.go
Fix JS deadlock and various optimizations
[goredo.git] / ood.go
diff --git a/ood.go b/ood.go
index a7c2d22422443c75b3d4c84d5f876ed0e5fc483a..4189ed459cae740df414d766ac3e6e8ceaedb675 100644 (file)
--- a/ood.go
+++ b/ood.go
@@ -31,6 +31,17 @@ import (
        "go.cypherpunks.ru/recfile"
 )
 
+type TgtErr struct {
+       Tgt string
+       Err error
+}
+
+func (e TgtErr) Unwrap() error { return e.Err }
+
+func (e TgtErr) Error() string {
+       return fmt.Sprintf("%s: %s", e.Tgt, e.Err)
+}
+
 func cwdAndTgt(tgt string) (string, string) {
        cwd, tgt := path.Split(tgt)
        cwd, err := filepath.Abs(cwd)
@@ -58,11 +69,52 @@ func isBuiltNow(fdDep *os.File) (bool, *recfile.Reader, error) {
                return false, nil, err
        }
        if m["Build"] == "" {
-               return false, r, errors.New("dep. missing 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
        indent := strings.Repeat(". ", level)
@@ -79,7 +131,7 @@ func isOOD(cwd, tgt string, level int) (bool, error) {
 
        builtNow, r, err := isBuiltNow(fdDep)
        if err != nil {
-               return true, err
+               return true, TgtErr{tgtOrig, err}
        }
        if builtNow {
                trace(CDebug, "ood: %s%s -> already built", indent, tgtOrig)
@@ -87,134 +139,114 @@ func isOOD(cwd, tgt string, level int) (bool, error) {
        }
 
        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, err
+                       return true, TgtErr{tgtOrig, err}
                }
                switch m["Type"] {
                case "always":
                        trace(CDebug, "ood: %s%s -> always", indent, tgtOrig)
                        ood = true
                case "ifcreate":
-                       theirTgt := m["Target"]
-                       if theirTgt == "" {
-                               return ood, errors.New("invalid format of dep." + tgtOrig)
-                       }
-                       if _, err = os.Stat(path.Join(cwd, theirTgt)); err == nil {
-                               trace(CDebug, "ood: %s%s -> created", indent, tgtOrig)
-                               ood = true
-                       }
+                       ifcreates = append(ifcreates, m)
                case "ifchange":
-                       dep := m["Target"]
-                       theirTs := m["Ctime"]
-                       theirHsh := m["Hash"]
-                       if dep == "" || theirTs == "" {
-                               return ood, errors.New("invalid format of dep." + tgtOrig)
-                       }
-                       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
-                                       continue
-                               }
-                               return ood, err
-                       }
-                       defer fd.Close()
-                       ts, err := fileCtime(fd)
-                       if err != nil {
-                               return ood, 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)
-                               ood = true
-                       } else {
-                               hsh, err := fileHash(fd)
-                               if err != nil {
-                                       return ood, err
-                               }
-                               if theirHsh == hsh {
-                                       trace(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
-                               } else {
-                                       trace(CDebug, "ood: %s%s -> %s: hash differs", indent, tgtOrig, dep)
-                                       ood = true
-                               }
-                       }
-                       fd.Close()
-                       if ood {
-                               continue
-                       }
-                       if dep == tgt {
-                               trace(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)
-                               continue
-                       } else {
-                               depOod, err := isOOD(cwd, dep, level+1)
-                               if depOod {
-                                       ood = true
-                                       trace(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep)
-                               } else {
-                                       trace(CDebug, "ood: %s%s -> %s: !ood", indent, tgtOrig, dep)
-                               }
-                               if err != nil {
-                                       return ood, err
-                               }
-                       }
+                       ifchanges = append(ifchanges, m)
                case "stamp":
                        stampOur = m["Hash"]
                        trace(CDebug, "ood: %s%s -> stamped: %s", indent, tgtOrig, stampOur)
                default:
-                       return ood, errors.New("invalid format of dep." + tgtOrig)
+                       return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")}
                }
        }
-       if ood && stampOur != "" {
-               errs := make(chan error, 0)
-               trace(CDebug, "ood: %s%s running, because stamped", indent, tgtOrig)
-               relTgt, err := filepath.Rel(Cwd, path.Join(cwd, tgt))
-               if err != nil {
-                       return true, err
+       if ood {
+               goto StampCheck
+       }
+
+       for _, m := range ifcreates {
+               theirTgt := m["Target"]
+               if theirTgt == "" {
+                       return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep")}
                }
-               if err = runScript(relTgt, errs); err != nil {
-                       return true, err
+               if _, err = os.Stat(path.Join(cwd, theirTgt)); err == nil {
+                       trace(CDebug, "ood: %s%s -> created", indent, tgtOrig)
+                       ood = true
+                       goto StampCheck
                }
-               if err = <-errs; err != nil {
-                       return true, 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")}
                }
-               fdDep, err := os.Open(depPath)
+               trace(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
+               fd, err := os.Open(path.Join(cwd, dep))
                if err != nil {
-                       return true, err
+                       if os.IsNotExist(err) {
+                               trace(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
+                               ood = true
+                               goto StampCheck
+                       }
+                       return ood, TgtErr{tgtOrig, err}
                }
-               defer fdDep.Close()
-               builtNow, r, err := isBuiltNow(fdDep)
+               defer fd.Close()
+               ts, err := fileCtime(fd)
                if err != nil {
-                       return true, err
-               }
-               if !builtNow {
-                       return true, fmt.Errorf("%s is not built", tgtOrig)
+                       return ood, TgtErr{tgtOrig, err}
                }
-               var stampTheir string
-               for {
-                       m, err := r.NextMap()
+               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)
+                       ood = true
+                       goto StampCheck
+               } else {
+                       hsh, err := fileHash(fd)
                        if err != nil {
-                               if err == io.EOF {
-                                       break
-                               }
-                               return true, err
+                               return ood, TgtErr{tgtOrig, err}
                        }
-                       if m["Type"] == "stamp" {
-                               stampTheir = m["Hash"]
-                               break
+                       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)
+               }
+               fd.Close()
+               if dep == tgt {
+                       trace(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)
+                       continue
+               }
+               depOod, err := isOOD(cwd, dep, level+1)
+               if err != nil {
+                       return ood, TgtErr{tgtOrig, err}
+               }
+               if depOod {
+                       trace(CDebug, "ood: %s%s -> %s: ood", indent, tgtOrig, dep)
+                       ood = true
+                       goto StampCheck
+               }
+               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 {