X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=33857bfc5c3fb227d3fa43f17ae0669cc8409cc1;hb=6dce71355599d4caf8267f6f02520037480f7ba3;hp=38bfc13562b72d162791ae683f8db45e50a49703;hpb=0cadba691640011e1b17d950aabc6c9b64dd631f;p=goredo.git

diff --git a/run.go b/run.go
index 38bfc13..33857bf 100644
--- a/run.go
+++ b/run.go
@@ -57,7 +57,7 @@ const (
 
 	RedoDir      = ".redo"
 	LockSuffix   = ".lock"
-	DepSuffix    = ".rec"
+	DepSuffix    = ".dep"
 	TmpPrefix    = ".redo."
 	LogSuffix    = ".log"
 	LogRecSuffix = ".log-rec"
@@ -133,7 +133,7 @@ func mkdirs(pth string) error {
 }
 
 func isModified(dep *Dep, tgt *Tgt) (
-	modified bool, ourInode *Inode, hshPrev Hash, err error,
+	modified bool, ourInode Inode, hshPrev Hash, err error,
 ) {
 	if dep == nil {
 		return
@@ -151,8 +151,8 @@ func isModified(dep *Dep, tgt *Tgt) (
 			err = ErrLine(err)
 			return
 		}
-		hshPrev = dep.hash
-		modified = !ourInode.Equals(dep.inode)
+		hshPrev = ifchange.Hash()
+		modified = !ourInode.Equals(ifchange.Inode())
 		break
 	}
 	return
@@ -169,12 +169,13 @@ func syncDir(dir string) error {
 }
 
 func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
-	redoDir := path.Join(tgt.h, RedoDir)
+	tgtH, tgtT := pathSplit(tgt.a)
+	redoDir := path.Join(tgtH, RedoDir)
 	if err := mkdirs(redoDir); err != nil {
 		return TgtError{tgt, ErrLine(err)}
 	}
 
-	shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgt, tgt.h)
+	shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgt, tgtH)
 	jsToken := jsAcquire(shCtx)
 	jsNeedsRelease := true
 	defer func() {
@@ -185,7 +186,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 
 	// Acquire lock
 	fdLock, err := os.OpenFile(
-		path.Join(redoDir, tgt.t+LockSuffix),
+		path.Join(redoDir, tgtT+LockSuffix),
 		os.O_WRONLY|os.O_TRUNC|os.O_CREATE,
 		os.FileMode(0666),
 	)
@@ -240,14 +241,14 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 					log.Fatal(err)
 				}
 			}
-			build, err := depReadBuild(tgt.Dep())
+			build, err := depBuildRead(tgt.dep)
 			if err == nil {
 				if build != BuildUUID {
 					err = errors.New("was not built: build differs")
 				}
 			} else {
 				if errors.Is(err, fs.ErrNotExist) {
-					err = errors.New("was not built: no .rec")
+					err = errors.New("was not built: no .dep")
 				}
 			}
 			if err != nil {
@@ -258,7 +259,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 		return nil
 	}
 
-	// It scans the whole .rec file while searching for the single target,
+	// It scans the whole .dep file while searching for the single target,
 	// but that one is always located at the very end
 	dep, err := depRead(tgt)
 	if err != nil {
@@ -296,14 +297,15 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 	}
 	dep = nil
 
-	// Start preparing .rec
-	fdDep, err := tempfile(redoDir, tgt.t+DepSuffix)
+	// Start preparing .dep
+	fdDep, err := tempfile(redoDir, tgtT+DepSuffix)
 	if err != nil {
 		lockRelease()
 		return TgtError{tgt, ErrLine(err)}
 	}
 	fdDepOpened := true
 	fdDepExists := true
+	fdDepW := bufio.NewWriter(fdDep)
 	cleanup := func() {
 		lockRelease()
 		if fdDepOpened {
@@ -313,9 +315,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 			os.Remove(fdDep.Name())
 		}
 	}
-	if _, err = recfile.NewWriter(fdDep).WriteFields(
-		recfile.Field{Name: "Build", Value: BuildUUID},
-	); err != nil {
+	if err = depBuildWrite(fdDepW, BuildUUID); err != nil {
 		cleanup()
 		return TgtError{tgt, ErrLine(err)}
 	}
@@ -323,11 +323,12 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 	var cwd string
 	var dirPrefix string
 	var doFile *Tgt
-	basename := tgt.t
+	var doFileT string
+	basename := tgtT
 	runErr := RunError{Tgt: tgt}
 	// Determine basename and DIRPREFIX
 	{
-		doFileRelPath, upLevels, err := findDo(fdDep, tgt.h, tgt.t)
+		doFileRelPath, upLevels, err := findDo(fdDepW, fdDep.Name(), tgtH, tgtT)
 		if err != nil {
 			cleanup()
 			return TgtError{tgt, ErrLine(err)}
@@ -336,25 +337,29 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 			cleanup()
 			return TgtError{tgt, errors.New("no .do found")}
 		}
-		// ents := strings.Split(strings.TrimSuffix(tgt.h, "/"), "/")
-		ents := strings.Split(tgt.h, "/")
+		ents := strings.Split(tgtH, "/")
 		ents = ents[len(ents)-upLevels:]
 		dirPrefix = path.Join(ents...)
 		ups := make([]string, 0, upLevels+2)
-		ups = append(ups, tgt.h)
+		ups = append(ups, tgtH)
 		for i := 0; i < upLevels; i++ {
 			ups = append(ups, "..")
 		}
 		ups = append(ups, doFileRelPath)
 		cwd = path.Clean(path.Join(ups[:len(ups)-1]...))
 		doFile = NewTgt(path.Join(ups...))
-		if strings.HasPrefix(doFile.t, "default.") {
-			basename = basename[:len(basename)-(len(doFile.t)-len("default.")-len(".do"))-1]
+		doFileT = path.Base(doFile.a)
+		if strings.HasPrefix(doFileT, "default.") {
+			basename = basename[:len(basename)-(len(doFileT)-len("default.")-len(".do"))-1]
 			runErr.DoFile = doFile.rel
 		}
 	}
 
-	if err = depWrite(fdDep, tgt.h, doFile, ""); err != nil {
+	if err = depWrite(fdDepW, fdDep.Name(), tgtH, doFile, ""); err != nil {
+		cleanup()
+		return TgtError{tgt, ErrLine(err)}
+	}
+	if err = fdDepW.Flush(); err != nil {
 		cleanup()
 		return TgtError{tgt, ErrLine(err)}
 	}
@@ -366,7 +371,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 	var cmdName string
 	var args []string
 	if err = unix.Access(doFile.rel, unix.X_OK); err == nil {
-		cmdName = doFile.t
+		cmdName = doFileT
 		args = make([]string, 0, 3)
 	} else {
 		cmdName = "/bin/sh"
@@ -375,11 +380,11 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 		} else {
 			args = append(args, "-e")
 		}
-		args = append(args, doFile.t)
+		args = append(args, doFileT)
 	}
 
 	// Temporary file for stdout
-	fdStdout, err := tempfile(tgt.h, tgt.t)
+	fdStdout, err := tempfile(tgtH, tgtT)
 	if err != nil {
 		cleanup()
 		return TgtError{tgt, ErrLine(err)}
@@ -389,7 +394,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 	tmpPathRel := mustRel(cwd, tmpPath)
 	args = append(
 		args,
-		path.Join(dirPrefix, tgt.t),
+		path.Join(dirPrefix, tgtT),
 		path.Join(dirPrefix, basename),
 		tmpPathRel,
 	)
@@ -434,7 +439,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 	var fdStderr *os.File
 	if StderrKeep {
 		fdStderr, err = os.OpenFile(
-			path.Join(redoDir, tgt.t+LogSuffix),
+			path.Join(redoDir, tgtT+LogSuffix),
 			os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
 			os.FileMode(0666),
 		)
@@ -496,6 +501,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 			return
 		}
 		fdDepOpened = true
+		fdDepW.Reset(fdDep)
 		cmd.ExtraFiles = append(cmd.ExtraFiles, fdDep)
 		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvDepFd, 3+fdNum))
 		fdNum++
@@ -508,14 +514,14 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 			fdStdout.Close()
 			if fdStderr != nil {
 				fdStderr.Close()
-				logRecPath := path.Join(redoDir, tgt.t+LogRecSuffix)
+				logRecPath := path.Join(redoDir, tgtT+LogRecSuffix)
 				if fdStderr, err = os.OpenFile(
 					logRecPath,
 					os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
 					os.FileMode(0666),
 				); err == nil {
 					fields := []recfile.Field{
-						{Name: "Build", Value: BuildUUID},
+						{Name: "Build", Value: BuildUUID.String()},
 						{Name: "PPID", Value: strconv.Itoa(os.Getpid())},
 						{Name: "Cwd", Value: cwd},
 					}
@@ -553,7 +559,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 					w := bufio.NewWriter(fdStderr)
 					{
 						var ifchanges []string
-						ifchanges, err = depReadOnlyIfchanges(tgt.Dep())
+						ifchanges, err = depReadOnlyIfchanges(tgt.dep)
 						if err != nil {
 							err = ErrLine(err)
 							goto Err
@@ -660,7 +666,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 
 		// Was $1 touched?
 		if inode, err := inodeFromFileByPath(tgt.a); err == nil {
-			if inodePrev == nil {
+			if inodePrev == "" {
 				runErr.Err = Err1WasTouched
 				errs <- runErr
 				return
@@ -710,7 +716,7 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 		// Do we need to ifcreate it, or ifchange with renaming?
 		if fd == nil {
 			os.Remove(tgt.a)
-			err = ifcreate(fdDep, tgt.t)
+			err = ifcreate(fdDepW, fdDep.Name(), tgtT)
 			if err != nil {
 				err = ErrLine(err)
 				goto Finish
@@ -739,12 +745,12 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 						goto Finish
 					}
 					if !NoSync {
-						err = ErrLine(syncDir(tgt.h))
+						err = ErrLine(syncDir(tgtH))
 						if err != nil {
 							goto Finish
 						}
 					}
-					err = ErrLine(depWrite(fdDep, tgt.h, tgt, hsh))
+					err = ErrLine(depWrite(fdDepW, fdDep.Name(), tgtH, tgt, hsh))
 					if err != nil {
 						goto Finish
 					}
@@ -762,26 +768,30 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 				goto Finish
 			}
 			if !NoSync {
-				err = ErrLine(syncDir(tgt.h))
+				err = ErrLine(syncDir(tgtH))
 				if err != nil {
 					goto Finish
 				}
 			}
-			err = ErrLine(depWrite(fdDep, tgt.h, tgt, hsh))
+			err = ErrLine(depWrite(fdDepW, fdDep.Name(), tgtH, tgt, hsh))
 			if err != nil {
 				goto Finish
 			}
 		}
 
 	RecCommit:
-		// Commit .rec
+		// Commit .dep
+		err = ErrLine(fdDepW.Flush())
+		if err != nil {
+			goto Finish
+		}
 		if !NoSync {
 			err = ErrLine(fdDep.Sync())
 			if err != nil {
 				goto Finish
 			}
 		}
-		err = ErrLine(os.Rename(fdDep.Name(), tgt.Dep()))
+		err = ErrLine(os.Rename(fdDep.Name(), tgt.dep))
 		if err != nil {
 			goto Finish
 		}
@@ -795,9 +805,9 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
 		fdDep.Close()
 		fdDepOpened = false
 
-		// Post-commit .rec sanitizing
-		if depInfo, err := depRead(tgt); err == nil {
-			ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))
+		// Post-commit .dep sanitizing
+		dep, err = depRead(tgt)
+		if err == nil {
 			ifchangeSeen := make(map[string]struct{}, len(dep.ifchanges))
 			for _, ifchange := range dep.ifchanges {
 				ifchangeSeen[ifchange.tgt.a] = struct{}{}