/*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+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
it under the terms of the GNU General Public License as published by
import (
"bufio"
- "encoding/hex"
"errors"
+ "flag"
"fmt"
"io"
+ "log"
"os"
"os/exec"
"path"
+ "path/filepath"
"strconv"
"strings"
+ "sync"
"syscall"
"time"
"go.cypherpunks.ru/recfile"
+ "go.cypherpunks.ru/tai64n/v2"
"golang.org/x/sys/unix"
)
const (
- RedoDir = ".redo"
- LockSuffix = ".lock"
- DepSuffix = ".dep"
- TmpPrefix = ".redo."
- LogSuffix = ".log"
+ EnvDepFd = "REDO_DEP_FD"
+ EnvDirPrefix = "REDO_DIRPREFIX"
+ EnvDepCwd = "REDO_DEP_CWD"
+ EnvBuildUUID = "REDO_BUILD_UUID"
+ EnvStderrPrefix = "REDO_STDERR_PREFIX"
+ EnvTrace = "REDO_TRACE"
+ EnvStderrKeep = "REDO_LOGS"
+ EnvStderrSilent = "REDO_SILENT"
+ EnvNoSync = "REDO_NO_SYNC"
+
+ RedoDir = ".redo"
+ LockSuffix = ".lock"
+ DepSuffix = ".rec"
+ TmpPrefix = ".redo."
+ LogSuffix = ".log"
+ LogRecSuffix = ".log-rec"
)
-func mkdirs(pth string) error {
- if _, err := os.Stat(pth); err == nil {
- return nil
+var (
+ NoSync = false
+ StderrKeep = false
+ StderrSilent = false
+ StderrPrefix string
+ Jobs sync.WaitGroup
+
+ flagTrace *bool
+ flagTraceAll *bool
+ flagStderrKeep *bool
+ flagStderrSilent *bool
+
+ TracedAll bool
+
+ RunningProcs = map[int]*os.Process{}
+ RunningProcsM sync.Mutex
+
+ Err1WasTouched = errors.New("$1 was explicitly touched")
+)
+
+func init() {
+ cmdName := CmdName()
+ if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) {
+ return
}
- return os.MkdirAll(pth, os.FileMode(0777))
+ flagTrace = flag.Bool("x", false, "trace (sh -x) current targets")
+ flagTraceAll = flag.Bool("xx", false,
+ fmt.Sprintf("trace (sh -x) all targets (%s=1)", EnvTrace))
+ flagStderrKeep = flag.Bool("k", false,
+ fmt.Sprintf("keep job's stderr (%s=1)", EnvStderrKeep))
+ flagStderrSilent = flag.Bool("s", false,
+ fmt.Sprintf("silent, do not print job's stderr (%s=1)", EnvStderrSilent))
}
-func tempsuffix() string {
- return strconv.FormatInt((time.Now().UnixNano()+int64(os.Getpid()))&0xFFFFFFFF, 16)
+type RunError struct {
+ Tgt string
+ DoFile string
+ Started *time.Time
+ Finished *time.Time
+ Err error
}
-func tempfile(dir, prefix string) (*os.File, error) {
- // It respects umask, unlike ioutil.TempFile
- name := path.Join(dir, TmpPrefix+prefix+"."+tempsuffix())
- return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, os.FileMode(0666))
+func (e *RunError) Name() string {
+ var name string
+ if e.DoFile == "" {
+ name = e.Tgt
+ } else {
+ name = fmt.Sprintf("%s (%s)", e.Tgt, e.DoFile)
+ }
+ if e.Finished == nil {
+ return name
+ }
+ return fmt.Sprintf("%s (%.3fs)", name, e.Finished.Sub(*e.Started).Seconds())
+}
+
+func (e RunError) Error() string {
+ return fmt.Sprintf("%s: %s", e.Name(), e.Err)
+}
+
+func mkdirs(pth string) error {
+ if _, err := os.Stat(pth); err == nil {
+ return nil
+ }
+ return os.MkdirAll(pth, os.FileMode(0777))
}
-func isModified(cwd, redoDir, tgt string) (bool, 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 ourInode *Inode
for {
m, err := r.NextMap()
if err != nil {
- if err == io.EOF {
+ if errors.Is(err, io.EOF) {
break
}
- return false, err
+ return false, nil, err
}
- if m["Target"] != tgt {
+ if m["Type"] != DepTypeIfchange || m["Target"] != tgt {
continue
}
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, nil
+ if !ourInode.Equals(theirInode) {
+ return true, ourInode, nil
}
break
}
- return false, nil
-}
-
-type RunErr struct {
- Tgt string
- DoFile string
- Started *time.Time
- Finished *time.Time
- Err error
-}
-
-func (e RunErr) Unwrap() error { return e.Err }
-
-func (e *RunErr) Name() string {
- var name string
- if e.DoFile == "" {
- name = e.Tgt
- } else {
- name = fmt.Sprintf("%s (%s)", e.Tgt, e.DoFile)
- }
- if e.Finished == nil {
- return name
- }
- return fmt.Sprintf("%s (%fsec)", name, e.Finished.Sub(*e.Started).Seconds())
-}
-
-func (e RunErr) Error() string {
- return fmt.Sprintf("%s: %s", e.Name(), e.Err)
+ return false, ourInode, nil
}
func syncDir(dir string) error {
return err
}
-func runScript(tgt string, errs chan error) error {
- tgtOrig := tgt
- cwd, tgt := cwdAndTgt(tgt)
+func runScript(tgtOrig string, errs chan error, traced bool) error {
+ cwd, tgt := cwdAndTgt(tgtOrig)
redoDir := path.Join(cwd, RedoDir)
if err := mkdirs(redoDir); err != nil {
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
// Acquire lock
os.FileMode(0666),
)
if err != nil {
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
lockRelease := func() {
- trace(CLock, "LOCK_UN: %s", fdLock.Name())
- unix.Flock(int(fdLock.Fd()), unix.LOCK_UN)
+ tracef(CLock, "LOCK_UN: %s", fdLock.Name())
+ if err := unix.Flock(int(fdLock.Fd()), unix.LOCK_UN); err != nil {
+ log.Fatalln(err)
+ }
fdLock.Close()
}
- trace(CLock, "LOCK_NB: %s", fdLock.Name())
+ tracef(CLock, "LOCK_NB: %s", fdLock.Name())
// Waiting for job completion, already taken by someone else
if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_EX|unix.LOCK_NB); err != nil {
if uintptr(err.(syscall.Errno)) != uintptr(unix.EWOULDBLOCK) {
fdLock.Close()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
- trace(CDebug, "waiting: %s", tgtOrig)
Jobs.Add(1)
+ tracef(CDebug, "waiting: %s", tgtOrig)
+ if FdStatus != nil {
+ if _, err = FdStatus.Write([]byte{StatusWait}); err != nil {
+ log.Fatalln(err)
+ }
+ }
go func() {
defer Jobs.Done()
- trace(CLock, "LOCK_EX: %s", fdLock.Name())
- unix.Flock(int(fdLock.Fd()), unix.LOCK_EX)
+ tracef(CLock, "LOCK_EX: %s", fdLock.Name())
+ if err := unix.Flock(int(fdLock.Fd()), unix.LOCK_EX); err != nil {
+ log.Fatalln(err)
+ }
lockRelease()
- trace(CDebug, "waiting done: %s", tgtOrig)
- var builtNow bool
+ tracef(CDebug, "waiting done: %s", tgtOrig)
+ if FdStatus != nil {
+ if _, err = FdStatus.Write([]byte{StatusWaited}); err != nil {
+ log.Fatalln(err)
+ }
+ }
+ var depInfo *DepInfo
fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix))
if err != nil {
if os.IsNotExist(err) {
- err = errors.New("was not built")
+ err = errors.New("was not built: no .rec")
}
goto Finish
}
- builtNow, _, err = isBuiltNow(fdDep)
+ defer fdDep.Close()
+ depInfo, err = depRead(fdDep)
if err != nil {
goto Finish
}
- if !builtNow {
- err = errors.New("was not built")
+ if depInfo.build != BuildUUID {
+ err = errors.New("was not built: build differs")
}
Finish:
if err != nil {
- err = TgtErr{tgtOrig, err}
+ err = TgtError{tgtOrig, err}
}
errs <- err
}()
}
// Check if target is not modified externally
- modified, err := isModified(cwd, redoDir, tgt)
+ modified, inodePrev, err := isModified(cwd, redoDir, tgt)
if err != nil {
lockRelease()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
if modified {
- trace(CWarn, "%s externally modified: not redoing", tgtOrig)
+ tracef(CWarn, "%s externally modified: not redoing", tgtOrig)
lockRelease()
- errs <- nil
- return TgtErr{tgtOrig, err}
+ go func() {
+ errs <- nil
+ }()
+ return nil
}
- // Start preparing .dep
+ // Start preparing .rec
fdDep, err := tempfile(redoDir, tgt+DepSuffix)
if err != nil {
lockRelease()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
+ fdDepPath := fdDep.Name()
cleanup := func() {
lockRelease()
fdDep.Close()
recfile.Field{Name: "Build", Value: BuildUUID},
); err != nil {
cleanup()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
// Find .do
doFile, upLevels, err := findDo(fdDep, cwd, tgt)
if err != nil {
cleanup()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
if doFile == "" {
cleanup()
- return TgtErr{tgtOrig, errors.New("no .do found")}
- }
- if err = writeDep(fdDep, cwd, doFile); err != nil {
- cleanup()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, errors.New("no .do found")}
}
// 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)
basename := tgt
- runErr := RunErr{Tgt: tgtOrig}
+ runErr := RunError{Tgt: tgtOrig}
if strings.HasPrefix(doFile, "default.") {
basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
- runErr.DoFile = doFile
+ runErr.DoFile = doFileRelPath
}
- trace(CWait, "%s", runErr.Name())
- doFile = path.Base(doFile)
+
+ if err = depWrite(fdDep, cwdOrig, doFileRelPath); err != nil {
+ cleanup()
+ return TgtError{tgtOrig, err}
+ }
+ fdDep.Close()
+ tracef(CWait, "%s", runErr.Name())
// Prepare command line
var cmdName string
var args []string
- if err = unix.Access(path.Join(cwd, doFile), unix.X_OK); err == nil {
- // Ordinary executable file
- cmdName = doFile
+ if err = unix.Access(doFilePath, unix.X_OK); err == nil {
+ cmdName = doFilePath
args = make([]string, 0, 3)
} else {
- fd, err := os.Open(path.Join(cwd, doFile))
- if err != nil {
- cleanup()
- return TgtErr{tgtOrig, err}
- }
- buf := make([]byte, 512)
- n, err := fd.Read(buf)
- if err != nil {
- cleanup()
- return TgtErr{tgtOrig, err}
- }
- if n > 3 && string(buf[:3]) == "#!/" {
- // Shebanged
- t := string(buf[2:n])
- nlIdx := strings.Index(t, "\n")
- if nlIdx == -1 {
- cleanup()
- return TgtErr{tgtOrig, errors.New("not fully read shebang")}
- }
- args = strings.Split(t[:nlIdx], " ")
- cmdName, args = args[0], args[1:]
+ cmdName = "/bin/sh"
+ if traced || TracedAll {
+ args = append(args, "-ex")
} else {
- // Shell
- cmdName = "/bin/sh"
- if Trace {
- args = append(args, "-ex")
- } else {
- args = append(args, "-e")
- }
+ args = append(args, "-e")
}
args = append(args, doFile)
}
// Temporary file for stdout
- fdStdout, err := tempfile(cwd, tgt)
+ fdStdout, err := tempfile(cwdOrig, tgt)
if err != nil {
cleanup()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
+ }
+ stdoutPath := fdStdout.Name()
+ fdStdout.Close()
+ tmpPath := stdoutPath + ".3" // and for $3
+ tmpPathRel, err := filepath.Rel(cwd, tmpPath)
+ if err != nil {
+ panic(err)
}
- tmpPath := fdStdout.Name() + ".3" // and for $3
- args = append(args, tgt, basename, path.Base(tmpPath))
+ args = append(
+ args,
+ path.Join(dirPrefix, tgt),
+ path.Join(dirPrefix, basename),
+ tmpPathRel,
+ )
cmd := exec.Command(cmdName, args...)
cmd.Dir = cwd
- cmd.Stdout = fdStdout
- cmd.Env = append(os.Environ(), fmt.Sprintf("%s=%d", RedoLevelEnv, Level+1))
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", RedoDirPrefixEnv, dirPrefix))
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", RedoBuildUUIDEnv, BuildUUID))
+ // 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))
+
childStderrPrefix := tempsuffix()
cmd.Env = append(cmd.Env, fmt.Sprintf(
- "%s=%s", RedoStderrPrefixEnv, childStderrPrefix,
+ "%s=%s", EnvStderrPrefix, childStderrPrefix,
))
- cmd.ExtraFiles = append(cmd.ExtraFiles, fdDep)
fdNum := 0
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", RedoDepFdEnv, 3+fdNum))
+ cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgts)
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsFd, 3+fdNum))
fdNum++
- if JSR == nil {
- // infinite jobs
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", RedoJSRFdEnv))
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", RedoJSWFdEnv))
+ cmd.ExtraFiles = append(cmd.ExtraFiles, FdOODTgtsLock)
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvOODTgtsLockFd, 3+fdNum))
+ fdNum++
+
+ if FdStatus == nil {
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvStatusFd))
} else {
- cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
- cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", RedoJSRFdEnv, 3+fdNum))
- fdNum++
- cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", RedoJSWFdEnv, 3+fdNum))
+ cmd.ExtraFiles = append(cmd.ExtraFiles, FdStatus)
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvStatusFd, 3+fdNum))
fdNum++
}
// Preparing stderr
- stderr, err := cmd.StderrPipe()
- if err != nil {
- panic(err)
- }
var fdStderr *os.File
if StderrKeep {
fdStderr, err = os.OpenFile(
path.Join(redoDir, tgt+LogSuffix),
- os.O_WRONLY|os.O_CREATE,
+ os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
os.FileMode(0666),
)
if err != nil {
cleanup()
- return TgtErr{tgtOrig, err}
+ return TgtError{tgtOrig, err}
}
- fdStderr.Truncate(0)
}
- shCtx := fmt.Sprintf("sh: %s: %s %s [%s]", tgtOrig, cmdName, args, cwd)
- trace(CDebug, "%s", shCtx)
+ shCtx := fmt.Sprintf(
+ "sh: %s: %s %s cwd:%s dirprefix:%s",
+ tgtOrig, cmdName, args, cwd, dirPrefix,
+ )
+ tracef(CDebug, "%s", shCtx)
Jobs.Add(1)
go func() {
- jsAcquire(shCtx)
+ jsToken := jsAcquire(shCtx)
+ if JSR == nil {
+ // infinite jobs
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvJobs))
+ } else {
+ cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
+ cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
+ makeFlags := fmt.Sprintf(
+ "%s %s%d,%d", MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
+ )
+ makeFlags = strings.Trim(makeFlags, " ")
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", MakeFlagsName, makeFlags))
+ fdNum += 2
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%d", EnvJSToken, jsToken))
+ }
+
+ if FdStatus != nil {
+ if _, err = FdStatus.Write([]byte{StatusRun}); err != nil {
+ log.Fatalln(err)
+ }
+ }
+
+ var finished time.Time
+ var exitErr *exec.ExitError
+ 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++
+ cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDepCwd, cwd))
+
defer func() {
- jsRelease(shCtx)
- lockRelease()
+ jsRelease(shCtx, jsToken)
fdDep.Close()
fdStdout.Close()
if fdStderr != nil {
fdStderr.Close()
+ logRecPath := path.Join(redoDir, tgt+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: "PPID", Value: strconv.Itoa(os.Getpid())},
+ {Name: "Cwd", Value: cwd},
+ }
+ if cmd.Process != nil {
+ fields = append(fields, recfile.Field{
+ Name: "PID", Value: strconv.Itoa(cmd.Process.Pid),
+ })
+ }
+ ts := new(tai64n.TAI64N)
+ ts.FromTime(started)
+ fields = append(fields,
+ recfile.Field{Name: "Started", Value: tai64n.Encode(ts[:])},
+ )
+ ts.FromTime(finished)
+ fields = append(fields,
+ recfile.Field{Name: "Finished", Value: tai64n.Encode(ts[:])})
+ fields = append(fields, recfile.Field{
+ Name: "Duration",
+ Value: strconv.FormatInt(finished.Sub(started).Nanoseconds(), 10),
+ })
+ fields = append(fields, recfile.Field{Name: "Cmd", Value: cmdName})
+ for _, arg := range args {
+ fields = append(fields, recfile.Field{Name: "Arg", Value: arg})
+ }
+ for _, env := range cmd.Env {
+ fields = append(fields, recfile.Field{Name: "Env", Value: env})
+ }
+ if exitErr != nil {
+ fields = append(fields, recfile.Field{
+ Name: "ExitCode",
+ Value: strconv.Itoa(exitErr.ProcessState.ExitCode()),
+ })
+ }
+ w := bufio.NewWriter(fdStderr)
+
+ var depInfo *DepInfo
+ fdDep, err := os.Open(fdDepPath)
+ if err != nil {
+ goto Err
+ }
+ depInfo, err = depRead(fdDep)
+ fdDep.Close()
+ if err != nil {
+ goto Err
+ }
+ for _, dep := range depInfo.ifchanges {
+ fields = append(fields, recfile.Field{
+ Name: "Ifchange",
+ Value: dep["Target"],
+ })
+ }
+ _, err = recfile.NewWriter(w).WriteFields(fields...)
+ if err != nil {
+ goto Err
+ }
+ err = w.Flush()
+ Err:
+ if err != nil {
+ log.Println(err)
+ os.Remove(logRecPath)
+ }
+ fdStderr.Close()
+ } else {
+ log.Println("can not open", logRecPath, ":", err)
+ }
}
+ lockRelease()
os.Remove(fdDep.Name())
os.Remove(fdStdout.Name())
os.Remove(tmpPath)
os.Remove(fdLock.Name())
+ if FdStatus != nil {
+ if _, err = FdStatus.Write([]byte{StatusDone}); err != nil {
+ log.Fatalln(err)
+ }
+ }
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
+ return
+ }
+ RunningProcsM.Lock()
+ RunningProcs[cmd.Process.Pid] = cmd.Process
+ RunningProcsM.Unlock()
pid := fmt.Sprintf("[%d]", cmd.Process.Pid)
- trace(CDebug, "%s runs %s", tgtOrig, pid)
+ tracef(CDebug, "%s runs %s", tgtOrig, pid)
- stderrTerm := make(chan struct{}, 0)
+ stderrTerm := make(chan struct{})
go func() {
scanner := bufio.NewScanner(stderr)
var line string
- ts := new(TAI64N)
+ ts := new(tai64n.TAI64N)
for scanner.Scan() {
line = scanner.Text()
if strings.HasPrefix(line, childStderrPrefix) {
continue
}
if fdStderr != nil {
- tai64nNow(ts)
- fmt.Fprintf(fdStderr, "@%s %s\n", hex.EncodeToString(ts[:]), line)
+ ts.FromTime(time.Now())
+ LogMutex.Lock()
+ fmt.Fprintln(fdStderr, tai64n.Encode(ts[:]), line)
+ LogMutex.Unlock()
}
if StderrSilent {
continue
}
if MyPid == 0 {
- trace(CNone, "%s", line)
+ tracef(CNone, "%s", line)
} else {
- trace(CNone, "%s %s", pid, line)
+ tracef(CNone, "%s %s", pid, line)
}
}
close(stderrTerm)
// Wait for job completion
<-stderrTerm
err = cmd.Wait()
- finished := time.Now()
+ RunningProcsM.Lock()
+ delete(RunningProcs, cmd.Process.Pid)
+ RunningProcsM.Unlock()
+ finished = time.Now()
runErr.Finished = &finished
if err != nil {
+ exitErr = err.(*exec.ExitError)
runErr.Err = err
errs <- runErr
return
}
+ // Was $1 touched?
+ if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+ errTouched := Err1WasTouched
+ if inodePrev == nil {
+ fd.Close()
+ runErr.Err = errTouched
+ errs <- runErr
+ return
+ }
+ inode, err := inodeFromFile(fd)
+ fd.Close()
+ if err != nil {
+ runErr.Err = err
+ errs <- runErr
+ return
+ }
+ if !inode.Equals(inodePrev) {
+ runErr.Err = errTouched
+ errs <- runErr
+ return
+ }
+ }
+
+ if inodePrev != nil {
+ if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+ inode, err := inodeFromFile(fd)
+ fd.Close()
+ if err == nil && !inode.Equals(inodePrev) {
+ runErr.Err = Err1WasTouched
+ errs <- runErr
+ return
+ }
+ }
+ }
+
// Does it produce both stdout and tmp?
fiStdout, err := os.Stat(fdStdout.Name())
if err != nil {
// Do we need to ifcreate it, of ifchange with renaming?
if fd == nil {
+ os.Remove(path.Join(cwdOrig, tgt))
err = ifcreate(fdDep, tgt)
if err != nil {
goto Finish
goto Finish
}
}
- err = writeDep(fdDep, cwdOrig, tgt)
+ err = depWrite(fdDep, cwdOrig, tgt)
if err != nil {
goto Finish
}
}
- // Commit .dep
+ // Commit .rec
if !NoSync {
err = fdDep.Sync()
if err != nil {
goto Finish
}
}
- err = os.Rename(fdDep.Name(), path.Join(redoDir, tgt+DepSuffix))
+ fdDepPath = path.Join(redoDir, tgt+DepSuffix)
+ err = os.Rename(fdDep.Name(), fdDepPath)
if err != nil {
goto Finish
}
}()
return nil
}
+
+func isOkRun(err error) bool {
+ if err == nil {
+ return true
+ }
+ var runErr RunError
+ if errors.As(err, &runErr) && runErr.Err == nil {
+ tracef(CRedo, "%s", runErr.Name())
+ return true
+ }
+ tracef(CErr, "%s", err)
+ return false
+}