Don't hold the cache lock while computing the manifest hash for the current object

Author: siu

clcache.py

@@ -1470,28 +1470,29 @@ def processDirect(cache, objectFile, compiler, cmdLine, sourceFile):
     manifestSection = cache.manifestRepository.section(manifestHash)
     with cache.lock:
         manifest = manifestSection.getManifest(manifestHash)
-        if manifest is not None:
-            # NOTE: command line options already included in hash for manifest name
-            includesContentHash = ManifestRepository.getIncludesContentHashForFiles(
-                [expandBasedirPlaceholder(include, baseDir) for include in manifest.includeFiles])
-            cachekey = manifest.includesContentToObjectMap.get(includesContentHash)
-            if cachekey is not None:
+    if manifest is not None:
+        # NOTE: command line options already included in hash for manifest name
+        includesContentHash = ManifestRepository.getIncludesContentHashForFiles(
+            [expandBasedirPlaceholder(include, baseDir) for include in manifest.includeFiles])
+        cachekey = manifest.includesContentToObjectMap.get(includesContentHash)
+        if cachekey is not None:
+            with cache.lock:
                 if cache.compilerArtifactsRepository.section(cachekey).hasEntry(cachekey):
                     return processCacheHit(cache, objectFile, cachekey)
-                else:
-                    postProcessing = lambda compilerResult: postprocessObjectEvicted(
-                        cache, objectFile, cachekey, compilerResult)
-            else:
-                postProcessing = lambda compilerResult: postprocessHeaderChangedMiss(
-                    cache, objectFile, manifestSection, manifest, manifestHash, includesContentHash, compilerResult)
+                
+            postProcessing = lambda compilerResult: postprocessObjectEvicted(
+                cache, objectFile, cachekey, compilerResult)
         else:
-            origCmdLine = cmdLine
-            stripIncludes = False
-            if '/showIncludes' not in cmdLine:
-                cmdLine = ['/showIncludes'] + origCmdLine
-                stripIncludes = True
-            postProcessing = lambda compilerResult: postprocessNoManifestMiss(
-                cache, objectFile, manifestSection, manifestHash, baseDir, sourceFile, compilerResult, stripIncludes)
+            postProcessing = lambda compilerResult: postprocessHeaderChangedMiss(
+                cache, objectFile, manifestSection, manifest, manifestHash, includesContentHash, compilerResult)
+    else:
+        origCmdLine = cmdLine
+        stripIncludes = False
+        if '/showIncludes' not in cmdLine:
+            cmdLine = ['/showIncludes'] + origCmdLine
+            stripIncludes = True
+        postProcessing = lambda compilerResult: postprocessNoManifestMiss(
+            cache, objectFile, manifestSection, manifestHash, baseDir, sourceFile, compilerResult, stripIncludes)
 
     compilerResult = invokeRealCompiler(compiler, cmdLine, captureOutput=True)
     compilerResult = postProcessing(compilerResult)