JavaScriptBench
diff --git a/‎tools/cache.py‎
Lines changed: 31 additions & 20 deletions b/‎tools/cache.py‎
Lines changed: 31 additions & 20 deletions
diff --git a/‎tools/duplicate_function_eliminator.py‎
Lines changed: 5 additions & 2 deletions b/‎tools/duplicate_function_eliminator.py‎
Lines changed: 5 additions & 2 deletions
@@ -1,6 +1,5 @@
 import os.path, sys, shutil, time, logging
-
-import tempfiles
+import tempfiles, filelock
 
 # Permanent cache for dlmalloc and stdlibc++
 class Cache:
@@ -17,15 +16,24 @@ def __init__(self, dirname=None, debug=False, use_subdir=True):
     self.dirname = dirname
     self.debug = debug
 
+    def reverse_chop(thestring, ending):
+      if thestring.endswith(ending):
+        return thestring[:-len(ending)]
+      return thestring
+
+    self.filelock = filelock.FileLock(reverse_chop(reverse_chop(self.dirname, '/'), '\\') + '.lock')
+
   def ensure(self):
-    shared.safe_ensure_dirs(self.dirname)
+    with self.filelock:
+      shared.safe_ensure_dirs(self.dirname)
 
   def erase(self):
-    tempfiles.try_delete(self.dirname)
-    try:
-      open(self.dirname + '__last_clear', 'w').write('last clear: ' + time.asctime() + '\n')
-    except Exception, e:
-      print >> sys.stderr, 'failed to save last clear time: ', e
+    with self.filelock:
+      tempfiles.try_delete(self.dirname)
+      try:
+        open(self.dirname + '__last_clear', 'w').write('last clear: ' + time.asctime() + '\n')
+      except Exception, e:
+        print >> sys.stderr, 'failed to save last clear time: ', e
 
   def get_path(self, shortname):
     return os.path.join(self.dirname, shortname)
@@ -35,18 +43,21 @@ def get_path(self, shortname):
   def get(self, shortname, creator, extension='.bc', what=None, force=False):
     if not shortname.endswith(extension): shortname += extension
     cachename = os.path.join(self.dirname, shortname)
-    if os.path.exists(cachename) and not force:
-      return cachename
-    if what is None:
-      if shortname.endswith(('.bc', '.so', '.a')): what = 'system library'
-      else: what = 'system asset'
-    message = 'generating ' + what + ': ' + shortname + '...'
-    logging.warn(message)
-    self.ensure()
-    temp = creator()
-    if temp != cachename:
-      shutil.copyfile(temp, cachename)
-    logging.warn(' '*len(message) + 'ok')
+
+    with self.filelock:
+      if os.path.exists(cachename) and not force:
+        return cachename
+      if what is None:
+        if shortname.endswith(('.bc', '.so', '.a')): what = 'system library'
+        else: what = 'system asset'
+      message = 'generating ' + what + ': ' + shortname + '...'
+      logging.warn(message)
+      self.ensure()
+      temp = creator()
+      if temp != cachename:
+        shutil.copyfile(temp, cachename)
+      logging.warn(' '*len(message) + 'ok')
+
     return cachename
 
 # Given a set of functions of form (ident, text), and a preferred chunk size,
 
@@ -247,8 +247,11 @@ def write_chunk(chunk, i):
       if DEBUG: print >> sys.stderr, 'splitting up js optimization into %d chunks, using %d cores  (total: %.2f MB)' % (len(chunks), cores, total_size/(1024*1024.))
       pool = multiprocessing.Pool(processes=cores)
       filenames = pool.map(run_on_chunk, commands, chunksize=1)
-      pool.terminate()
-      pool.join()
+      try:
+        pool.terminate()
+        pool.join()
+      except Exception, e:
+        pass
     else:
       # We can't parallize, but still break into chunks to avoid uglify/node memory issues
       if len(chunks) > 1 and DEBUG: print >> sys.stderr, 'splitting up js optimization into %d chunks' % (len(chunks))