replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Diagnose timeouts in the LockFileManager and delete the dead lock file 

If the lock file manager times out, we should give an error rather than
silently trying to load the existing module.  And delete the
(presumably) dead lock file, since it will otherwise prevent progress in
future invokations. This is unsound since we have no way to prove that
the lock file we are deleting is the same one we timed out on, but since
the lock is only to avoid excessive rebuilding anyway it should be okay.
Depends on llvm r228603.

llvm-svn: 228604
This commit is contained in:
Ben Langmuir 2015-02-09 20:35:13 +00:00
parent d2d52de229
commit 1daf480146
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticCommonKinds.td
View File

@ -83,6 +83,8 @@ def err_module_not_found : Error<"module '%0' not found">, DefaultFatal;
def err_module_not_built : Error<"could not build module '%0'">, DefaultFatal;
def err_module_lock_failure : Error<
"could not acquire lock file for module '%0'">, DefaultFatal;
def err_module_lock_timeout : Error<
"timed out waiting to acquire lock file for module '%0'">, DefaultFatal;
def err_module_cycle : Error<"cyclic dependency in module '%0': %1">,
DefaultFatal;
def note_pragma_entered_here : Note<"#pragma entered here">;

14
clang/lib/Frontend/CompilerInstance.cpp
View File

@ -1022,9 +1022,19 @@ static bool compileAndLoadModule(CompilerInstance &ImportingInstance,
case llvm::LockFileManager::LFS_Shared:
// Someone else is responsible for building the module. Wait for them to
// finish.
if (Locked.waitForUnlock() == llvm::LockFileManager::Res_OwnerDied)
switch (Locked.waitForUnlock()) {
case llvm::LockFileManager::Res_Success:
ModuleLoadCapabilities |= ASTReader::ARR_OutOfDate;
break;
case llvm::LockFileManager::Res_OwnerDied:
continue; // try again to get the lock.
ModuleLoadCapabilities |= ASTReader::ARR_OutOfDate;
case llvm::LockFileManager::Res_Timeout:
Diags.Report(ModuleNameLoc, diag::err_module_lock_timeout)
<< Module->Name;
// Clear the lock file so that future invokations can make progress.
Locked.unsafeRemoveLockFile();
return false;
}
break;
}