redo-always thoughts

[goredo.git] / run.go

diff --git a/run.go b/run.go
index 1dc937dedb6313a469420fafe6137194ebda262e..4ca90d649af939e151326ea2636f65cd59e6f3bc 100644 (file)
--- 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 {
@@ -87,7 +89,7 @@ func (e *RunErr) Name() string {
        if e.Finished == nil {
                return name
        }
-       return fmt.Sprintf("%s (%fsec)", name, e.Finished.Sub(*e.Started).Seconds())
+       return fmt.Sprintf("%s (%.3fs)", name, e.Finished.Sub(*e.Started).Seconds())
 }
 
 func (e RunErr) Error() string {
@@ -204,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
                        }
@@ -240,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()
@@ -292,6 +295,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                cleanup()
                return TgtErr{tgtOrig, err}
        }
+       fdDep.Close()
        trace(CWait, "%s", runErr.Name())
 
        // Prepare command line
@@ -302,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")
@@ -316,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)
@@ -330,7 +336,6 @@ 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))
@@ -342,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 {
@@ -367,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(
@@ -396,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()
@@ -413,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
@@ -437,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.Fprintln(fdStderr, tai64n.Encode(ts[:]), line)
                                        LogMutex.Unlock()
                                }
                                if StderrSilent {
@@ -473,7 +502,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error {
                                if err == nil && !inode.Equals(inodePrev) {
                                        runErr.Err = errors.New("$1 was explicitly touched")
                                        errs <- runErr
-                                       fd.Close()
                                        return
                                }
                        }
@@ -543,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 {