vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Protecting diagnostic access with mutex

Browse Source
This commit is contained in:
Strahinja Val Markovic 2012-08-01 17:18:35 -07:00
parent 06d653c60d
commit 11a52d018c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpp/ycm/ClangCompleter.cpp
View File

@ -38,6 +38,7 @@ using boost::shared_ptr;
using boost::bind; using boost::bind;
using boost::thread; using boost::thread;
using boost::lock_guard; using boost::lock_guard;
using boost::unique_lock;
using boost::mutex; using boost::mutex;
using boost::unordered_map; using boost::unordered_map;
@ -340,12 +341,14 @@ void ClangCompleter::SetFileCompileFlags(
std::vector< Diagnostic > ClangCompleter::DiagnosticsForFile( std::vector< Diagnostic > ClangCompleter::DiagnosticsForFile(
const std::string &filename ) const std::string &filename )
{ {
// TODO: make sure that accessing the translation unit is thread safe; what if std::vector< Diagnostic > diagnostics;
// a bg thread is parsing the TU when we try to access the diagnostics? unique_lock< mutex > lock( file_parse_task_mutex_, boost::try_to_lock_t );
if ( !lock.owns_lock() )
return diagnostics;
CXTranslationUnit unit = FindWithDefault( filename_to_translation_unit_, CXTranslationUnit unit = FindWithDefault( filename_to_translation_unit_,
filename, filename,
NULL ); NULL );
std::vector< Diagnostic > diagnostics;
if ( !unit ) if ( !unit )
return diagnostics; return diagnostics;