Skip to content

Commit

Permalink
Filter deps with index.blacklist. (MaskRay#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
scturtle authored and MaskRay committed Aug 30, 2018
1 parent 1ae97c6 commit 5cc3006
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/pipeline.cc
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ std::unique_ptr<IndexFile> RawCacheLoad(const std::string &path) {
}

bool Indexer_Parse(DiagnosticsPublisher *diag_pub, WorkingFiles *working_files,
Project *project, VFS *vfs) {
Project *project, VFS *vfs, const GroupMatch &matcher) {
std::optional<Index_Request> opt_request = index_request->TryPopFront();
if (!opt_request)
return false;
Expand All @@ -167,6 +167,11 @@ bool Indexer_Parse(DiagnosticsPublisher *diag_pub, WorkingFiles *working_files,
return false;
}

if (std::string reason; !matcher.IsMatch(request.path, &reason)) {
LOG_S(INFO) << "skip " << request.path << " for " << reason;
return false;
}

Project::Entry entry;
{
std::lock_guard<std::mutex> lock(project->mutex_);
Expand Down Expand Up @@ -259,6 +264,12 @@ bool Indexer_Parse(DiagnosticsPublisher *diag_pub, WorkingFiles *working_files,
std::string path = curr->path;
if (!(vfs->Stamp(path, curr->last_write_time) || path == path_to_index))
continue;
if (std::string reason; !matcher.IsMatch(path, &reason)) {
LOG_S(INFO) << "skip emitting and storing index of " << path << " for "
<< reason;
continue;
}

LOG_S(INFO) << "emit index for " << path;
prev = RawCacheLoad(path);

Expand Down Expand Up @@ -307,8 +318,9 @@ void Init() {

void Indexer_Main(DiagnosticsPublisher *diag_pub, VFS *vfs, Project *project,
WorkingFiles *working_files) {
GroupMatch matcher(g_config->index.whitelist, g_config->index.blacklist);
while (true)
if (!Indexer_Parse(diag_pub, working_files, project, vfs))
if (!Indexer_Parse(diag_pub, working_files, project, vfs, matcher))
indexer_waiter->Wait(index_request);
}

Expand Down

0 comments on commit 5cc3006

Please sign in to comment.