Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include/internal/catch_list.cpp
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-07 12:39:07 +0100
committerMartin Hořeňovský2019-11-14 10:53:12 +0100
commitd36c15c3caf96c2e751f4ad83a386c1fd047c2f6 (patch)
treecba3faef17447ccfd3a2c9a7e751f8a52e2ae226 /include/internal/catch_list.cpp
parent302e2c0b06f131199b97ad33bdebacc359782ff0 (diff)
downloadcatch3-d36c15c3caf96c2e751f4ad83a386c1fd047c2f6.tar.gz
Store tags in one big pre-allocated string and only work with refs
This should decrease the number of allocations before main is entered significantly, but complicates the code somewhat in return. Assuming I used `massif` right, doing just `SelfTest --list-tests` went from 929 allocations at "Remove gcc-4.9 from the travis builds" (2 commits up), to 614 allocations with this commit.
Diffstat (limited to 'include/internal/catch_list.cpp')
-rw-r--r--include/internal/catch_list.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/include/internal/catch_list.cpp b/include/internal/catch_list.cpp
index db88ff16..cd003433 100644
--- a/include/internal/catch_list.cpp
+++ b/include/internal/catch_list.cpp
@@ -38,14 +38,13 @@ namespace Catch {
TestSpec testSpec = config.testSpec();
std::vector<TestCaseHandle> matchedTestCases = filterTests(getAllTestCasesSorted(config), testSpec, config);
- std::map<std::string, TagInfo> tagCounts;
+ std::map<StringRef, TagInfo> tagCounts;
for (auto const& testCase : matchedTestCases) {
for (auto const& tagName : testCase.getTestCaseInfo().tags) {
- std::string lcaseTagName = toLower(tagName);
- auto countIt = tagCounts.find(lcaseTagName);
- if (countIt == tagCounts.end())
- countIt = tagCounts.insert(std::make_pair(lcaseTagName, TagInfo())).first;
- countIt->second.add(tagName);
+ auto it = tagCounts.find(tagName.lowerCased);
+ if (it == tagCounts.end())
+ it = tagCounts.insert(std::make_pair(tagName.lowerCased, TagInfo())).first;
+ it->second.add(tagName.original);
}
}
@@ -71,16 +70,16 @@ namespace Catch {
} // end anonymous namespace
- void TagInfo::add( std::string const& spelling ) {
+ void TagInfo::add( StringRef spelling ) {
++count;
spellings.insert( spelling );
}
std::string TagInfo::all() const {
- size_t size = 0;
+ // 2 per tag for brackets '[' and ']'
+ size_t size = spellings.size() * 2;
for (auto const& spelling : spellings) {
- // Add 2 for the brackes
- size += spelling.size() + 2;
+ size += spelling.size();
}
std::string out; out.reserve(size);