forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a race condition generating stampfiles.

Browse source 
This makes 'redo -j1000' now run successfully in t/curse, except that we
foolishly generate the same files more than once.  But at least not more
than once *in parallel*.
This commit is contained in:
Avery Pennarun 2010-11-19 00:57:27 -08:00
commit a5ff60ccf3
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
redo.py
View file

@ -79,17 +79,19 @@ def find_do_file(t):
def stamp(t):
stampfile = sname('stamp', t)
newstampfile = sname('stamp' + str(os.getpid()), t)
depfile = sname('dep', t)
if not os.path.exists(vars.BASE + '/.redo'):
# .redo might not exist in a 'make clean' target
return
open(stampfile, 'w').close()
open(depfile, 'a').close()
open(newstampfile, 'w').close()
try:
mtime = os.stat(t).st_mtime
except OSError:
mtime = 0
os.utime(stampfile, (mtime, mtime))
os.utime(newstampfile, (mtime, mtime))
os.rename(newstampfile, stampfile)
open(depfile, 'a').close()
def _preexec(t):
@ -106,8 +108,8 @@ def _build(t):
# an existing source file that is not marked as a generated file.
# This step is mentioned by djb in his notes. It turns out to be
# important to prevent infinite recursion. For example, a rule
# called default.o.do could be used to try to produce hello.c.o,
# which is stupid since hello.c is a static file.
# called default.c.do could be used to try to produce hello.c,
# which is undesirable since hello.c existed already.
stamp(t)
return # success
unlink(sname('dep', t))