X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=a4aeb8738206b7bac7030d28dce67e07ffb74714;hb=468a150138cdc10c3ec5ee00a77db06429b47456;hp=f08547008d9f76a04e11b164be62e553bfa5a4c5;hpb=8d7b239655f024fa18f22a1d7988d184732000c3;p=goredo.git

diff --git a/run.go b/run.go
index f085470..a4aeb87 100644
--- a/run.go
+++ b/run.go
@@ -1,5 +1,5 @@
 /*
-goredo -- redo implementation on pure Go
+goredo -- djb's redo implementation on pure Go
 Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@ import (
 	"time"
 
 	"go.cypherpunks.ru/recfile"
-	"go.cypherpunks.ru/tai64n"
+	"go.cypherpunks.ru/tai64n/v2"
 	"golang.org/x/sys/unix"
 )
 
@@ -51,7 +51,7 @@ const (
 
 	RedoDir    = ".redo"
 	LockSuffix = ".lock"
-	DepSuffix  = ".dep"
+	DepSuffix  = ".rec"
 	TmpPrefix  = ".redo."
 	LogSuffix  = ".log"
 )
@@ -67,6 +67,8 @@ var (
 	flagTraceAll     = flag.Bool("xx", false, fmt.Sprintf("trace (sh -x) all targets (%s=1)", EnvTrace))
 	flagStderrKeep   = flag.Bool("logs", false, fmt.Sprintf("keep job's stderr (%s=1)", EnvStderrKeep))
 	flagStderrSilent = flag.Bool("silent", false, fmt.Sprintf("do not print job's stderr (%s=1)", EnvStderrSilent))
+
+	TracedAll bool
 )
 
 type RunErr struct {
@@ -101,24 +103,24 @@ func mkdirs(pth string) error {
 	return os.MkdirAll(pth, os.FileMode(0777))
 }
 
-func isModified(cwd, redoDir, tgt string) (bool, string, error) {
+func isModified(cwd, redoDir, tgt string) (bool, *Inode, error) {
 	fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
 	if err != nil {
 		if os.IsNotExist(err) {
-			return false, "", nil
+			return false, nil, nil
 		}
-		return false, "", err
+		return false, nil, err
 	}
 	defer fdDep.Close()
 	r := recfile.NewReader(fdDep)
-	var ourTs string
+	var ourInode *Inode
 	for {
 		m, err := r.NextMap()
 		if err != nil {
 			if err == io.EOF {
 				break
 			}
-			return false, "", err
+			return false, nil, err
 		}
 		if m["Target"] != tgt {
 			continue
@@ -126,21 +128,25 @@ func isModified(cwd, redoDir, tgt string) (bool, string, error) {
 		fd, err := os.Open(path.Join(cwd, tgt))
 		if err != nil {
 			if os.IsNotExist(err) {
-				return false, "", nil
+				return false, nil, nil
 			}
-			return false, "", err
+			return false, nil, err
+		}
+		ourInode, err = inodeFromFile(fd)
+		fd.Close()
+		if err != nil {
+			return false, nil, err
 		}
-		defer fd.Close()
-		ourTs, err = fileCtime(fd)
+		theirInode, err := inodeFromRec(m)
 		if err != nil {
-			return false, "", err
+			return false, nil, err
 		}
-		if ourTs != m["Ctime"] {
-			return true, ourTs, nil
+		if !ourInode.Equals(theirInode) {
+			return true, ourInode, nil
 		}
 		break
 	}
-	return false, ourTs, nil
+	return false, ourInode, nil
 }
 
 func syncDir(dir string) error {
@@ -200,7 +206,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 			fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
 			if err != nil {
 				if os.IsNotExist(err) {
-					err = errors.New("was not built: no .dep")
+					err = errors.New("was not built: no .rec")
 				}
 				goto Finish
 			}
@@ -222,7 +228,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Check if target is not modified externally
-	modified, tsPrev, err := isModified(cwd, redoDir, tgt)
+	modified, inodePrev, err := isModified(cwd, redoDir, tgt)
 	if err != nil {
 		lockRelease()
 		return TgtErr{tgtOrig, err}
@@ -236,12 +242,13 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		return nil
 	}
 
-	// Start preparing .dep
+	// Start preparing .rec
 	fdDep, err := tempfile(redoDir, tgt+DepSuffix)
 	if err != nil {
 		lockRelease()
 		return TgtErr{tgtOrig, err}
 	}
+	fdDepPath := fdDep.Name()
 	cleanup := func() {
 		lockRelease()
 		fdDep.Close()
@@ -266,12 +273,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Determine basename and DIRPREFIX
+	doFileRelPath := doFile
 	ents := strings.Split(cwd, "/")
 	ents = ents[len(ents)-upLevels:]
 	dirPrefix := path.Join(ents...)
 	cwdOrig := cwd
 	for i := 0; i < upLevels; i++ {
 		cwd = path.Join(cwd, "..")
+		doFileRelPath = path.Join("..", doFileRelPath)
 	}
 	cwd = path.Clean(cwd)
 	doFilePath := path.Join(cwd, doFile)
@@ -279,13 +288,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	runErr := RunErr{Tgt: tgtOrig}
 	if strings.HasPrefix(doFile, "default.") {
 		basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
-		runErr.DoFile = doFile
+		runErr.DoFile = doFileRelPath
 	}
 
-	if err = writeDep(fdDep, cwd, doFile); err != nil {
+	if err = writeDep(fdDep, cwdOrig, doFileRelPath); err != nil {
 		cleanup()
 		return TgtErr{tgtOrig, err}
 	}
+	fdDep.Close()
 	trace(CWait, "%s", runErr.Name())
 
 	// Prepare command line
@@ -296,7 +306,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		args = make([]string, 0, 3)
 	} else {
 		cmdName = "/bin/sh"
-		if traced {
+		if traced || TracedAll {
 			args = append(args, "-ex")
 		} else {
 			args = append(args, "-e")
@@ -310,7 +320,9 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		cleanup()
 		return TgtErr{tgtOrig, err}
 	}
-	tmpPath := fdStdout.Name() + ".3" // and for $3
+	stdoutPath := fdStdout.Name()
+	fdStdout.Close()
+	tmpPath := stdoutPath + ".3" // and for $3
 	tmpPathRel, err := filepath.Rel(cwd, tmpPath)
 	if err != nil {
 		panic(err)
@@ -324,7 +336,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 
 	cmd := exec.Command(cmdName, args...)
 	cmd.Dir = cwd
-	cmd.Stdout = fdStdout
+	// cmd.Stdin reads from /dev/null by default
 	cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%d", EnvLevel, Level+1))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDirPrefix, dirPrefix))
 	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvBuildUUID, BuildUUID))
@@ -335,8 +347,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	))
 
 	fdNum := 0
-	cmd.ExtraFiles = append(cmd.ExtraFiles, fdDep)
-	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvDepFd, 3+fdNum))
+	cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgts)
+	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsFd, 3+fdNum))
+	fdNum++
+	cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgtsLock)
+	cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsLockFd, 3+fdNum))
 	fdNum++
 
 	if FdStatus == nil {
@@ -360,10 +375,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 	}
 
 	// Preparing stderr
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		panic(err)
-	}
 	var fdStderr *os.File
 	if StderrKeep {
 		fdStderr, err = os.OpenFile(
@@ -377,7 +388,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 		fdStderr.Truncate(0)
 	}
-	shCtx := fmt.Sprintf("sh: %s: %s %s [%s]", tgtOrig, cmdName, args, cwd)
+	shCtx := fmt.Sprintf(
+		"sh: %s: %s %s cwd:%s dirprefix:%s",
+		tgtOrig, cmdName, args, cwd, dirPrefix,
+	)
 	trace(CDebug, "%s", shCtx)
 
 	Jobs.Add(1)
@@ -386,6 +400,26 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		if FdStatus != nil {
 			FdStatus.Write([]byte{StatusRun})
 		}
+
+		started := time.Now()
+		runErr.Started = &started
+		fdStdout, err = os.OpenFile(stdoutPath, os.O_RDWR, os.FileMode(0666))
+		if err != nil {
+			runErr.Err = err
+			errs <- runErr
+			return
+		}
+		cmd.Stdout = fdStdout
+		fdDep, err = os.OpenFile(fdDepPath, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+		if err != nil {
+			runErr.Err = err
+			errs <- runErr
+			return
+		}
+		cmd.ExtraFiles = append(cmd.ExtraFiles, fdDep)
+		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvDepFd, 3+fdNum))
+		fdNum++
+
 		defer func() {
 			jsRelease(shCtx)
 			lockRelease()
@@ -403,9 +437,14 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 			}
 			Jobs.Done()
 		}()
-		started := time.Now()
-		runErr.Started = &started
-		err := cmd.Start()
+		stderr, err := cmd.StderrPipe()
+		if err != nil {
+			runErr.Err = err
+			errs <- runErr
+			return
+		}
+		started = time.Now()
+		err = cmd.Start()
 		if err != nil {
 			runErr.Err = err
 			errs <- runErr
@@ -427,9 +466,9 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 					continue
 				}
 				if fdStderr != nil {
-					tai64n.FromTime(time.Now(), ts)
+					ts.FromTime(time.Now())
 					LogMutex.Lock()
-					fmt.Fprintf(fdStderr, "%s %s\n", ts.Encode(), line)
+					fmt.Fprintf(fdStderr, "%s %s\n", tai64n.Encode(ts[:]), line)
 					LogMutex.Unlock()
 				}
 				if StderrSilent {
@@ -456,14 +495,13 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 		}
 
 		// Was $1 touched?
-		if tsPrev != "" {
+		if inodePrev != nil {
 			if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
-				ts, err := fileCtime(fd)
+				inode, err := inodeFromFile(fd)
 				fd.Close()
-				if err == nil && ts != tsPrev {
+				if err == nil && !inode.Equals(inodePrev) {
 					runErr.Err = errors.New("$1 was explicitly touched")
 					errs <- runErr
-					fd.Close()
 					return
 				}
 			}
@@ -533,7 +571,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
 			}
 		}
 
-		// Commit .dep
+		// Commit .rec
 		if !NoSync {
 			err = fdDep.Sync()
 			if err != nil {