}
type RunError struct {
- Tgt string
+ Tgt *Tgt
DoFile string
Started *time.Time
Finished *time.Time
func (e *RunError) Name() string {
var name string
if e.DoFile == "" {
- name = e.Tgt
+ name = e.Tgt.String()
} else {
name = fmt.Sprintf("%s (%s)", e.Tgt, e.DoFile)
}
return os.MkdirAll(pth, os.FileMode(0777))
}
-func isModified(depInfo *DepInfo, cwd, tgt string) (
+func isModified(depInfo *DepInfo, tgt *Tgt) (
modified bool, ourInode *Inode, hshPrev []byte, err error,
) {
if depInfo == nil {
return
}
for _, dep := range depInfo.ifchanges {
- if dep.tgt != tgt {
+ if dep.tgt.a != tgt.a {
continue
}
- ourInode, err = inodeFromFileByPath(path.Join(cwd, tgt))
+ ourInode, err = inodeFromFileByPath(tgt.a)
if err != nil {
if os.IsNotExist(err) {
err = nil
return err
}
-func runScript(tgtOrig string, errs chan error, forced, traced bool) error {
- cwd, tgt := cwdAndTgt(tgtOrig)
- redoDir := path.Join(cwd, RedoDir)
+func runScript(tgt *Tgt, errs chan error, forced, traced bool) error {
+ redoDir := path.Join(tgt.h, RedoDir)
if err := mkdirs(redoDir); err != nil {
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
- shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgtOrig, cwd)
+ shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgt, tgt.h)
jsToken := jsAcquire(shCtx)
jsNeedsRelease := true
defer func() {
// Acquire lock
fdLock, err := os.OpenFile(
- path.Join(redoDir, tgt+LockSuffix),
+ path.Join(redoDir, tgt.t+LockSuffix),
os.O_WRONLY|os.O_TRUNC|os.O_CREATE,
os.FileMode(0666),
)
if err != nil {
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
flock := unix.Flock_t{
Type: unix.F_WRLCK,
if err = unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil {
if uintptr(err.(syscall.Errno)) != uintptr(unix.EAGAIN) {
fdLock.Close()
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
Jobs.Add(1)
if err = unix.FcntlFlock(fdLock.Fd(), unix.F_GETLK, &flock); err != nil {
log.Fatalln(err, fdLock.Name())
}
- tracef(CDebug, "waiting: %s (pid=%d)", tgtOrig, flock.Pid)
+ tracef(CDebug, "waiting: %s (pid=%d)", tgt, flock.Pid)
if FdStatus != nil {
if _, err = FdStatus.Write([]byte{StatusWait}); err != nil {
log.Fatal(err)
log.Fatalln(err, fdLock.Name())
}
lockRelease()
- tracef(CDebug, "waiting done: %s", tgtOrig)
+ tracef(CDebug, "waiting done: %s", tgt)
if FdStatus != nil {
if _, err = FdStatus.Write([]byte{StatusWaited}); err != nil {
log.Fatal(err)
}
}
- build, err := depReadBuild(path.Join(redoDir, tgt+DepSuffix))
+ build, err := depReadBuild(tgt.Dep())
if err == nil {
if build != BuildUUID {
err = errors.New("was not built: build differs")
}
}
if err != nil {
- err = TgtError{tgtOrig, err}
+ err = TgtError{tgt, err}
}
errs <- err
}()
// It scans the whole .rec file while searching for the single target,
// but that one is always located at the very end
- depInfo, err := depRead(path.Join(redoDir, tgt+DepSuffix))
+ depInfo, err := depRead(tgt)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
err = nil
} else {
lockRelease()
- return TgtError{tgtOrig, err}
+ return TgtError{tgt, ErrLine(err)}
}
}
}
// Check if target is not modified externally
- modified, inodePrev, hshPrev, err := isModified(depInfo, cwd, tgt)
+ modified, inodePrev, hshPrev, err := isModified(depInfo, tgt)
if err != nil {
lockRelease()
- return TgtError{tgtOrig, err}
+ return TgtError{tgt, ErrLine(err)}
}
if modified {
lockRelease()
if StopIfMod {
- return fmt.Errorf("%s externally modified", tgtOrig)
+ return fmt.Errorf("%s externally modified", tgt)
}
- tracef(CWarn, "%s externally modified: not redoing", tgtOrig)
+ tracef(CWarn, "%s externally modified: not redoing", tgt)
go func() {
errs <- nil
}()
depInfo = nil
// Start preparing .rec
- fdDep, err := tempfile(redoDir, tgt+DepSuffix)
+ fdDep, err := tempfile(redoDir, tgt.t+DepSuffix)
if err != nil {
lockRelease()
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
fdDepOpened := true
fdDepPath := fdDep.Name()
recfile.Field{Name: "Build", Value: BuildUUID},
); err != nil {
cleanup()
- return TgtError{tgtOrig, ErrLine(err)}
- }
-
- // Find .do
- doFile, upLevels, err := findDo(fdDep, cwd, tgt)
- if err != nil {
- cleanup()
- return TgtError{tgtOrig, ErrLine(err)}
- }
- if doFile == "" {
- cleanup()
- return TgtError{tgtOrig, errors.New("no .do found")}
+ return TgtError{tgt, ErrLine(err)}
}
+ var cwd string
+ var dirPrefix string
+ var doFile *Tgt
+ basename := tgt.t
+ runErr := RunError{Tgt: tgt}
// 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 := RunError{Tgt: tgtOrig}
- if strings.HasPrefix(doFile, "default.") {
- basename = tgt[:len(tgt)-(len(doFile)-len("default.")-len(".do"))-1]
- runErr.DoFile = doFileRelPath
+ {
+ doFileRelPath, upLevels, err := findDo(fdDep, tgt.h, tgt.t)
+ if err != nil {
+ cleanup()
+ return TgtError{tgt, ErrLine(err)}
+ }
+ if doFileRelPath == "" {
+ cleanup()
+ return TgtError{tgt, errors.New("no .do found")}
+ }
+ // ents := strings.Split(strings.TrimSuffix(tgt.h, "/"), "/")
+ ents := strings.Split(tgt.h, "/")
+ ents = ents[len(ents)-upLevels:]
+ dirPrefix = path.Join(ents...)
+ ups := make([]string, 0, upLevels+2)
+ ups = append(ups, tgt.h)
+ for i := 0; i < upLevels; i++ {
+ ups = append(ups, "..")
+ }
+ ups = append(ups, doFileRelPath)
+ cwd = path.Clean(path.Join(ups[:len(ups)-1]...))
+ doFile = NewTgt(path.Join(ups...))
+ if strings.HasPrefix(doFile.t, "default.") {
+ basename = basename[:len(basename)-(len(doFile.t)-len("default.")-len(".do"))-1]
+ runErr.DoFile = doFile.String()
+ }
}
- if err = depWrite(fdDep, cwdOrig, doFileRelPath, nil); err != nil {
+ if err = depWrite(fdDep, tgt.h, doFile, nil); err != nil {
cleanup()
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
fdDep.Close()
fdDepOpened = false
// Prepare command line
var cmdName string
var args []string
- if err = unix.Access(doFilePath, unix.X_OK); err == nil {
- cmdName = doFilePath
+ if err = unix.Access(doFile.String(), unix.X_OK); err == nil {
+ cmdName = doFile.t
args = make([]string, 0, 3)
} else {
cmdName = "/bin/sh"
} else {
args = append(args, "-e")
}
- args = append(args, doFile)
+ args = append(args, doFile.t)
}
// Temporary file for stdout
- fdStdout, err := tempfile(cwdOrig, tgt)
+ fdStdout, err := tempfile(tgt.h, tgt.t)
if err != nil {
cleanup()
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
stdoutPath := fdStdout.Name()
fdStdout.Close()
tmpPathRel := mustRel(cwd, tmpPath)
args = append(
args,
- path.Join(dirPrefix, tgt),
+ path.Join(dirPrefix, tgt.t),
path.Join(dirPrefix, basename),
tmpPathRel,
)
shCtx = fmt.Sprintf(
"sh: %s: %s %s cwd:%s dirprefix:%s",
- tgtOrig, cmdName, args, cwd, dirPrefix,
+ tgt, cmdName, args, cwd, dirPrefix,
)
cmd := exec.Command(cmdName, args...)
var fdStderr *os.File
if StderrKeep {
fdStderr, err = os.OpenFile(
- path.Join(redoDir, tgt+LogSuffix),
+ path.Join(redoDir, tgt.t+LogSuffix),
os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
os.FileMode(0666),
)
if err != nil {
cleanup()
- return TgtError{tgtOrig, ErrLine(err)}
+ return TgtError{tgt, ErrLine(err)}
}
}
tracef(CDebug, "%s", shCtx)
fdStdout.Close()
if fdStderr != nil {
fdStderr.Close()
- logRecPath := path.Join(redoDir, tgt+LogRecSuffix)
+ logRecPath := path.Join(redoDir, tgt.t+LogRecSuffix)
if fdStderr, err = os.OpenFile(
logRecPath,
os.O_WRONLY|os.O_CREATE|os.O_TRUNC,
Value: strconv.Itoa(exitErr.ProcessState.ExitCode()),
})
}
- w := bufio.NewWriter(fdStderr)
- depInfo, err := depRead(fdDepPath)
- if err != nil {
- err = ErrLine(err)
- goto Err
- }
- for _, dep := range depInfo.ifchanges {
- fields = append(fields, recfile.Field{
- Name: "Ifchange",
- Value: dep.tgt,
- })
+ w := bufio.NewWriter(fdStderr)
+ {
+ var ifchanges []string
+ ifchanges, err = depReadOnlyIfchanges(tgt.Dep())
+ if err != nil {
+ err = ErrLine(err)
+ goto Err
+ }
+ for _, dep := range ifchanges {
+ fields = append(fields, recfile.Field{
+ Name: "Ifchange",
+ Value: dep,
+ })
+ }
}
_, err = recfile.NewWriter(w).WriteFields(fields...)
if err != nil {
RunningProcs[cmd.Process.Pid] = cmd.Process
RunningProcsM.Unlock()
pid := fmt.Sprintf("[%d]", cmd.Process.Pid)
- tracef(CDebug, "%s runs %s", tgtOrig, pid)
+ tracef(CDebug, "%s runs %s", tgt, pid)
stderrTerm := make(chan struct{})
go func() {
}
// Was $1 touched?
- if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil {
+ if inode, err := inodeFromFileByPath(tgt.a); err == nil {
if inodePrev == nil {
runErr.Err = Err1WasTouched
errs <- runErr
// Do we need to ifcreate it, or ifchange with renaming?
if fd == nil {
- os.Remove(path.Join(cwdOrig, tgt))
- err = ifcreate(fdDep, tgt)
+ os.Remove(tgt.a)
+ err = ifcreate(fdDep, tgt.t)
if err != nil {
err = ErrLine(err)
goto Finish
goto Finish
}
if bytes.Equal(hsh, hshPrev) {
- tracef(CDebug, "%s has same hash, not renaming", tgtOrig)
+ tracef(CDebug, "%s has same hash, not renaming", tgt)
err = ErrLine(os.Remove(fd.Name()))
if err != nil {
goto Finish
}
- err = ErrLine(os.Chtimes(path.Join(cwdOrig, tgt), finished, finished))
+ err = ErrLine(os.Chtimes(tgt.a, finished, finished))
if err != nil {
goto Finish
}
if !NoSync {
- err = ErrLine(syncDir(cwdOrig))
+ err = ErrLine(syncDir(tgt.h))
if err != nil {
goto Finish
}
}
- err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hsh))
+ err = ErrLine(depWrite(fdDep, tgt.h, tgt, hsh))
if err != nil {
goto Finish
}
goto Finish
}
}
- err = ErrLine(os.Rename(fd.Name(), path.Join(cwdOrig, tgt)))
+ err = ErrLine(os.Rename(fd.Name(), tgt.a))
if err != nil {
goto Finish
}
if !NoSync {
- err = ErrLine(syncDir(cwdOrig))
+ err = ErrLine(syncDir(tgt.h))
if err != nil {
goto Finish
}
}
- err = ErrLine(depWrite(fdDep, cwdOrig, tgt, hsh))
+ err = ErrLine(depWrite(fdDep, tgt.h, tgt, hsh))
if err != nil {
goto Finish
}
goto Finish
}
}
- fdDepPath = path.Join(redoDir, tgt+DepSuffix)
- err = ErrLine(os.Rename(fdDep.Name(), fdDepPath))
+ err = ErrLine(os.Rename(fdDep.Name(), tgt.Dep()))
if err != nil {
goto Finish
}
fdDepOpened = false
// Post-commit .rec sanitizing
- if depInfo, err := depRead(fdDepPath); err == nil {
+ if depInfo, err := depRead(tgt); err == nil {
ifchangeSeen := make(map[string]struct{}, len(depInfo.ifchanges))
for _, dep := range depInfo.ifchanges {
- ifchangeSeen[dep.tgt] = struct{}{}
+ ifchangeSeen[dep.tgt.a] = struct{}{}
}
for _, dep := range depInfo.ifcreates {
- if _, exists := ifchangeSeen[dep]; exists {
+ if _, exists := ifchangeSeen[dep.a]; exists {
tracef(CWarn, "simultaneous ifcreate and ifchange records: %s", tgt)
}
}