X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=run.go;h=1bdbfe861c3b132f859ab0b5d0cf2413d98dba4f;hb=ae56a3b66db9f60612f656b0046427ef139c2119;hp=ba841522835e50dad65a5523ff5fe6c4d545ad8c;hpb=61724b2573b9a0a27fa381c3809ad86ba55acfa7;p=goredo.git diff --git a/run.go b/run.go index ba84152..1bdbfe8 100644 --- a/run.go +++ b/run.go @@ -21,6 +21,8 @@ package main import ( "bufio" + "crypto/rand" + "encoding/hex" "errors" "flag" "fmt" @@ -69,10 +71,11 @@ var ( StopIfMod = false Jobs sync.WaitGroup - flagTrace *bool - flagTraceAll *bool - flagStderrKeep *bool - flagStderrSilent *bool + flagTrace *bool + flagTraceAll *bool + flagStderrKeep *bool + flagStderrSilent *bool + flagForcedIfchange *bool TracedAll bool @@ -94,6 +97,7 @@ func init() { 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)) + flagForcedIfchange = flag.Bool("f", false, "forced redo-ifchange") } type RunError struct { @@ -122,56 +126,52 @@ func (e RunError) Error() string { } func mkdirs(pth string) error { - if _, err := os.Stat(pth); err == nil { + if FileExists(pth) { return nil } return os.MkdirAll(pth, os.FileMode(0777)) } -func isModified(cwd, redoDir, tgt string) (bool, *Inode, error) { +func isModified(cwd, redoDir, tgt string) (bool, *Inode, string, error) { fdDep, err := os.Open(path.Join(redoDir, tgt+DepSuffix)) if err != nil { if os.IsNotExist(err) { - return false, nil, nil + return false, nil, "", nil } - return false, nil, err + return false, nil, "", err } defer fdDep.Close() r := recfile.NewReader(fdDep) + var modified bool var ourInode *Inode + var hshPrev string for { m, err := r.NextMap() if err != nil { if errors.Is(err, io.EOF) { break } - return false, nil, err + return false, nil, "", err } if m["Type"] != DepTypeIfchange || m["Target"] != tgt { continue } - fd, err := os.Open(path.Join(cwd, tgt)) + ourInode, err = inodeFromFileByPath(path.Join(cwd, tgt)) if err != nil { if os.IsNotExist(err) { - return false, nil, nil + return false, nil, "", nil } - return false, nil, err - } - ourInode, err = inodeFromFile(fd) - fd.Close() - if err != nil { - return false, nil, err + return false, nil, "", err } theirInode, err := inodeFromRec(m) if err != nil { - return false, nil, err - } - if !ourInode.Equals(theirInode) { - return true, ourInode, nil + return false, nil, "", err } + hshPrev = m["Hash"] + modified = !ourInode.Equals(theirInode) break } - return false, ourInode, nil + return modified, ourInode, hshPrev, nil } func syncDir(dir string) error { @@ -191,6 +191,15 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { return TgtError{tgtOrig, err} } + shCtx := fmt.Sprintf("sh: %s: cwd:%s", tgtOrig, cwd) + jsToken := jsAcquire(shCtx) + jsNeedsRelease := true + defer func() { + if jsNeedsRelease { + jsRelease(shCtx, jsToken) + } + }() + // Acquire lock fdLock, err := os.OpenFile( path.Join(redoDir, tgt+LockSuffix), @@ -208,7 +217,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { tracef(CLock, "LOCK_UN: %s", fdLock.Name()) flock.Type = unix.F_UNLCK if err := unix.FcntlFlock(fdLock.Fd(), unix.F_SETLK, &flock); err != nil { - log.Fatalln(err) + log.Fatalln(err, fdLock.Name()) } fdLock.Close() } @@ -222,7 +231,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { } Jobs.Add(1) if err = unix.FcntlFlock(fdLock.Fd(), unix.F_GETLK, &flock); err != nil { - log.Fatalln(err) + log.Fatalln(err, fdLock.Name()) } tracef(CDebug, "waiting: %s (pid=%d)", tgtOrig, flock.Pid) if FdStatus != nil { @@ -233,8 +242,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { go func() { defer Jobs.Done() tracef(CLock, "LOCK_EX: %s", fdLock.Name()) + LockAgain: if err := unix.FcntlFlock(fdLock.Fd(), unix.F_SETLKW, &flock); err != nil { - log.Fatalln(err) + log.Println(err, fdLock.Name()) + time.Sleep(10 * time.Millisecond) + goto LockAgain } lockRelease() tracef(CDebug, "waiting done: %s", tgtOrig) @@ -262,6 +274,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { Finish: if err != nil { err = TgtError{tgtOrig, err} + fdLock.Close() } errs <- err }() @@ -269,7 +282,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { } // Check if target is not modified externally - modified, inodePrev, err := isModified(cwd, redoDir, tgt) + modified, inodePrev, hshPrev, err := isModified(cwd, redoDir, tgt) if err != nil { lockRelease() return TgtError{tgtOrig, err} @@ -335,7 +348,7 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { runErr.DoFile = doFileRelPath } - if err = depWrite(fdDep, cwdOrig, doFileRelPath); err != nil { + if err = depWrite(fdDep, cwdOrig, doFileRelPath, ""); err != nil { cleanup() return TgtError{tgtOrig, err} } @@ -377,6 +390,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { path.Join(dirPrefix, basename), tmpPathRel, ) + shCtx = fmt.Sprintf( + "sh: %s: %s %s cwd:%s dirprefix:%s", + tgtOrig, cmdName, args, cwd, dirPrefix, + ) cmd := exec.Command(cmdName, args...) cmd.Dir = cwd @@ -385,7 +402,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDirPrefix, dirPrefix)) cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvBuildUUID, BuildUUID)) - childStderrPrefix := tempsuffix() + childStderrPrefixRaw := make([]byte, 8) + if _, err = io.ReadFull(rand.Reader, childStderrPrefixRaw); err != nil { + panic(err) + } + childStderrPrefix := hex.EncodeToString(childStderrPrefixRaw) cmd.Env = append(cmd.Env, fmt.Sprintf( "%s=%s", EnvStderrPrefix, childStderrPrefix, )) @@ -419,15 +440,11 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { return TgtError{tgtOrig, err} } } - shCtx := fmt.Sprintf( - "sh: %s: %s %s cwd:%s dirprefix:%s", - tgtOrig, cmdName, args, cwd, dirPrefix, - ) tracef(CDebug, "%s", shCtx) + jsNeedsRelease = false Jobs.Add(1) go func() { - jsToken := jsAcquire(shCtx) if JSR == nil { // infinite jobs cmd.Env = append(cmd.Env, fmt.Sprintf("%s=NO", EnvJobs)) @@ -449,12 +466,17 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { } } + defer jsRelease(shCtx, jsToken) + 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 { + if fdStderr != nil { + fdStderr.Close() + } runErr.Err = err errs <- runErr return @@ -462,6 +484,10 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { cmd.Stdout = fdStdout fdDep, err = os.OpenFile(fdDepPath, os.O_WRONLY|os.O_APPEND, os.FileMode(0666)) if err != nil { + if fdStderr != nil { + fdStderr.Close() + } + fdStdout.Close() runErr.Err = err errs <- runErr return @@ -472,7 +498,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", EnvDepCwd, cwd)) defer func() { - jsRelease(shCtx, jsToken) fdDep.Close() fdStdout.Close() if fdStderr != nil { @@ -555,7 +580,6 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { 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) @@ -628,15 +652,12 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { } // Was $1 touched? - if fd, err := os.Open(path.Join(cwdOrig, tgt)); err == nil { + if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil { if inodePrev == nil { - fd.Close() runErr.Err = Err1WasTouched errs <- runErr return } - inode, err := inodeFromFile(fd) - fd.Close() if err != nil { runErr.Err = err errs <- runErr @@ -650,10 +671,8 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { } 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) { + if inode, err := inodeFromFileByPath(path.Join(cwdOrig, tgt)); err == nil { + if !inode.Equals(inodePrev) { runErr.Err = Err1WasTouched errs <- runErr return @@ -703,6 +722,39 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { goto Finish } } else { + var hsh string + if hshPrev != "" { + _, err = fd.Seek(0, io.SeekStart) + if err != nil { + goto Finish + } + hsh, err = fileHash(fd) + if err != nil { + goto Finish + } + if hsh == hshPrev { + tracef(CDebug, "%s has same hash, not renaming", tgtOrig) + err = os.Remove(fd.Name()) + if err != nil { + goto Finish + } + err = os.Chtimes(path.Join(cwdOrig, tgt), finished, finished) + if err != nil { + goto Finish + } + if !NoSync { + err = syncDir(cwdOrig) + if err != nil { + goto Finish + } + } + err = depWrite(fdDep, cwdOrig, tgt, hshPrev) + if err != nil { + goto Finish + } + goto RecCommit + } + } if !NoSync { err = fd.Sync() if err != nil { @@ -719,12 +771,13 @@ func runScript(tgtOrig string, errs chan error, traced bool) error { goto Finish } } - err = depWrite(fdDep, cwdOrig, tgt) + err = depWrite(fdDep, cwdOrig, tgt, hsh) if err != nil { goto Finish } } + RecCommit: // Commit .rec if !NoSync { err = fdDep.Sync()