2805b0fe85
Everything that needs access to filetype_map_ has been split into a new class called IdentifierDatabase. This class is thread-safe. Previously, multiple threads could access filetype_map_ at the same time, some reading things from it, others writing to it. WTF was I doing? My best guess is that I introduced this vile stupidity when I added the second thread to IdentifierCompleter; previously it was impossible for multiple threads to stomp on filetype_map_ because only one thread ever accessed it. I changed that some time ago and forgot to protect filetype_map_. Idiot.
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
// Copyright (C) 2013 Strahinja Val Markovic <val@markovic.io>
|
|
//
|
|
// This file is part of YouCompleteMe.
|
|
//
|
|
// YouCompleteMe is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// YouCompleteMe is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#ifndef IDENTIFIERDATABASE_H_ZESX3CVR
|
|
#define IDENTIFIERDATABASE_H_ZESX3CVR
|
|
|
|
#include <boost/utility.hpp>
|
|
#include <boost/unordered_map.hpp>
|
|
#include <boost/thread/mutex.hpp>
|
|
#include <boost/shared_ptr.hpp>
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
|
|
namespace YouCompleteMe {
|
|
|
|
class Candidate;
|
|
class Result;
|
|
class CandidateRepository;
|
|
|
|
|
|
// This class stores the database of identifiers the identifier completer has
|
|
// seen. It stores them in a data structure that makes it easy to tell which
|
|
// identifier came from which file and what files have which filetypes.
|
|
//
|
|
// The main point of this class is to isolate the parts of the code that need
|
|
// access to this internal data structure so that it's easier to confirm that
|
|
// mutexes are used correctly to protect concurrent access.
|
|
//
|
|
// This class is thread-safe.
|
|
class IdentifierDatabase : boost::noncopyable {
|
|
public:
|
|
IdentifierDatabase();
|
|
|
|
void AddCandidates(
|
|
const std::vector< std::string > &new_candidates,
|
|
const std::string &filetype,
|
|
const std::string &filepath );
|
|
|
|
void ClearCandidatesStoredForFile( const std::string &filetype,
|
|
const std::string &filepath );
|
|
|
|
void ResultsForQueryAndType( const std::string &query,
|
|
const std::string &filetype,
|
|
std::vector< Result > &results ) const;
|
|
|
|
private:
|
|
std::list< const Candidate * > &GetCandidateList(
|
|
const std::string &filetype,
|
|
const std::string &filepath );
|
|
|
|
// filepath -> *( *candidate )
|
|
typedef boost::unordered_map < std::string,
|
|
boost::shared_ptr< std::list< const Candidate * > > >
|
|
FilepathToCandidates;
|
|
|
|
// filetype -> *( filepath -> *( *candidate ) )
|
|
typedef boost::unordered_map < std::string,
|
|
boost::shared_ptr< FilepathToCandidates > > FiletypeMap;
|
|
|
|
|
|
CandidateRepository &candidate_repository_;
|
|
|
|
FiletypeMap filetype_map_;
|
|
mutable boost::mutex filetype_map_mutex_;
|
|
};
|
|
|
|
} // namespace YouCompleteMe
|
|
|
|
|
|
#endif /* end of include guard: IDENTIFIERDATABASE_H_ZESX3CVR */
|
|
|