flagStderrSilent *bool
TracedAll bool
+
+ RunningProcs = map[int]*os.Process{}
+ RunningProcsM sync.Mutex
)
func init() {
} else {
cmd.ExtraFiles = append(cmd.ExtraFiles, JSR)
cmd.ExtraFiles = append(cmd.ExtraFiles, JSW)
- cmd.Env = append(cmd.Env, fmt.Sprintf(
- "%s=%s %s%d,%d",
- MakeFlagsName, MakeFlags, MakeJSArg, 3+fdNum+0, 3+fdNum+1,
- ))
+ 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))
}
); err == nil {
fields := []recfile.Field{
{Name: "Build", Value: BuildUUID},
- {Name: "PID", Value: strconv.Itoa(cmd.Process.Pid)},
{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,
})
fields = append(fields, recfile.Field{Name: "Cmd", Value: cmdName})
for _, arg := range args {
- fields = append(fields, recfile.Field{Name: "Cmd", Value: arg})
+ fields = append(fields, recfile.Field{Name: "Arg", Value: arg})
}
for _, env := range cmd.Env {
fields = append(fields, recfile.Field{Name: "Env", Value: env})
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)
// Wait for job completion
<-stderrTerm
err = cmd.Wait()
+ RunningProcsM.Lock()
+ delete(RunningProcs, cmd.Process.Pid)
+ RunningProcsM.Unlock()
finished = time.Now()
runErr.Finished = &finished
if err != nil {
}
// Was $1 touched?
+ if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil {
+ errTouched := errors.New("$1 was explicitly touched")
+ if inodePrev == nil {
+ fd.Close()
+ runErr.Err = errTouched
+ errs <- runErr
+ return
+ } else {
+ 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)