github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

rose_build_merge: correctly merge NFA outfixes

Browse Source 
We were not doing our bookkeeping properly for merges where the number
of NFAs was greater than the batch size of 200.
This commit is contained in:
Justin Viiret
2016-11-23 15:38:26 +11:00
committed by Matthew Barr
parent eb7759361d
commit ef99ae108f
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rose/rose_build_merge.cpp
View File

@@ -311,8 +311,7 @@ void mergeCluster(RoseGraph &g, const ReportManager &rm,
it = it2;
DEBUG_PRINTF("merging cluster %zu\n", cluster.size());
map<NGHolder *, NGHolder *> merged;
mergeNfaCluster(cluster, &rm, merged, cc);
auto merged = mergeNfaCluster(cluster, &rm, cc);
DEBUG_PRINTF("done\n");
for (const auto &m : merged) {
@@ -2414,7 +2413,8 @@ map<NGHolder *, NGHolder *> chunkedNfaMerge(RoseBuildImpl &build,
batch.push_back(*it);
assert((*it)->kind == NFA_OUTFIX);
if (batch.size() == MERGE_GROUP_SIZE_MAX || next(it) == ite) {
mergeNfaCluster(batch, &build.rm, merged, build.cc);
auto batch_merged = mergeNfaCluster(batch, &build.rm, build.cc);
insert(&merged, batch_merged);
batch.clear();
}
}