Prevent race

[goredo.git] / run.go

diff --git a/run.go b/run.go
index 037e7bd330433a16fd19f4f80e17e22c4d9e1a95..7ca2a70d5c6f6359881cd6a0bdafba574db0d232 100644 (file)
--- a/run.go
+++ b/run.go
@@ -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
@@ -289,9 +289,11 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
                if StopIfMod {
                        return fmt.Errorf("%s externally modified", tgt)
                }
+               Jobs.Add(1)
                tracef(CWarn, "%s externally modified: not redoing", tgt)
                go func() {
                        errs <- nil
+                       Jobs.Done()
                }()
                return nil
        }
@@ -371,7 +373,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 = doFileT
+               cmdName = doFile.a
                args = make([]string, 0, 3)
        } else {
                cmdName = "/bin/sh"
@@ -628,24 +630,27 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
                                line = scanner.Text()
                                if strings.HasPrefix(line, childStderrPrefix) {
                                        line = line[len(childStderrPrefix):]
-                                       LogMutex.Lock()
-                                       os.Stderr.WriteString(StderrPrefix + line + "\n")
-                                       LogMutex.Unlock()
+                                       if StderrPrefix == "" {
+                                               withPrependedTgt(line)
+                                       } else {
+                                               stderrWrite(StderrPrefix + line + "\n")
+                                       }
                                        continue
                                }
                                if fdStderr != nil {
                                        ts.FromTime(time.Now())
-                                       LogMutex.Lock()
                                        fmt.Fprintln(fdStderr, tai64n.Encode(ts[:]), line)
-                                       LogMutex.Unlock()
                                }
                                if StderrSilent {
                                        continue
                                }
-                               if MyPid == 0 {
-                                       tracef(CNone, "%s", line)
+                               if MyPID != 0 {
+                                       line = pid + " " + line
+                               }
+                               if StderrPrefix == "" {
+                                       withPrependedTgt("[" + tgt.rel + "]" + line)
                                } else {
-                                       tracef(CNone, "%s %s", pid, line)
+                                       stderrWrite(StderrPrefix + "[" + tgt.rel + "]" + line + "\n")
                                }
                        }
                        close(stderrTerm)
@@ -668,7 +673,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 == "" {
+                       if inodePrev == nil {
                                runErr.Err = Err1WasTouched
                                errs <- runErr
                                return
@@ -711,12 +716,13 @@ func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
                                err = ErrLine(err)
                                goto Finish
                        }
+                       defer fd.Close()
                        if fi, rerr := fd.Stat(); rerr == nil {
                                chmod = fi.Mode()
                        } else {
-                               err = rerr
+                               err = ErrLine(rerr)
+                               goto Finish
                        }
-                       defer fd.Close()
                } else if fiStdout.Size() > 0 {
                        fd = fdStdout
                }