Trace category groups and category filter.

base/debug/trace_event_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/trace_event_unittest.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
@@ skipping 726 matching lines @@
 TEST_F(TraceEventTestFixture, Categories) {
   ManualTestSetUp();
 
   // Test that categories that are used can be retrieved whether trace was
   // enabled or disabled when the trace event was encountered.
   TRACE_EVENT_INSTANT0("c1", "name");
   TRACE_EVENT_INSTANT0("c2", "name");
   BeginTrace();
   TRACE_EVENT_INSTANT0("c3", "name");
   TRACE_EVENT_INSTANT0("c4", "name");
+  //Categories made of more than one tag.
+  TRACE_EVENT_INSTANT0("c5,c6", "name");
+  TRACE_EVENT_INSTANT0("c7, c8", "name");
   EndTraceAndFlush();
   std::vector<std::string> cats;
   TraceLog::GetInstance()->GetKnownCategories(&cats);
   EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c1") != cats.end());
   EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c2") != cats.end());
   EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c3") != cats.end());
   EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c4") != cats.end());
+  EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c5,c6") != cats.end());
+  EXPECT_TRUE(std::find(cats.begin(), cats.end(), "c7, c8") != cats.end());
 
-  const std::vector<std::string> empty_categories;
-  std::vector<std::string> included_categories;
-  std::vector<std::string> excluded_categories;
+  const std::vector<std::string> empty_tag_patterns;
+  std::vector<std::string> included_tag_patterns;
+  std::vector<std::string> excluded_tag_patterns;
 
   // Test that category filtering works.
 
   // Include nonexistent category -> no events
   Clear();
-  included_categories.clear();
-  included_categories.push_back("not_found823564786");
-  TraceLog::GetInstance()->SetEnabled(included_categories, empty_categories);
+  included_tag_patterns.clear();
+  included_tag_patterns.push_back("not_found823564786");
+  TraceLog::GetInstance()->SetEnabled(included_tag_patterns,
+                                      empty_tag_patterns);
   TRACE_EVENT_INSTANT0("cat1", "name");
   TRACE_EVENT_INSTANT0("cat2", "name");
   EndTraceAndFlush();
   EXPECT_TRUE(trace_parsed_.empty());
 
   // Include existent category -> only events of that category
   Clear();
-  included_categories.clear();
-  included_categories.push_back("inc");
-  TraceLog::GetInstance()->SetEnabled(included_categories, empty_categories);
+  included_tag_patterns.clear();
+  included_tag_patterns.push_back("inc");
+  TraceLog::GetInstance()->SetEnabled(included_tag_patterns,
+                                      empty_tag_patterns);
   TRACE_EVENT_INSTANT0("inc", "name");
   TRACE_EVENT_INSTANT0("inc2", "name");
   EndTraceAndFlush();
   EXPECT_TRUE(FindMatchingValue("cat", "inc"));
   EXPECT_FALSE(FindNonMatchingValue("cat", "inc"));
 
   // Include existent wildcard -> all categories matching wildcard
   Clear();
-  included_categories.clear();
-  included_categories.push_back("inc_wildcard_*");
-  included_categories.push_back("inc_wildchar_?_end");
-  TraceLog::GetInstance()->SetEnabled(included_categories, empty_categories);
+  included_tag_patterns.clear();
+  included_tag_patterns.push_back("inc_wildcard_*");
+  included_tag_patterns.push_back("inc_wildchar_?_end");
+  TraceLog::GetInstance()->SetEnabled(included_tag_patterns,
+                                      empty_tag_patterns);
   TRACE_EVENT_INSTANT0("inc_wildcard_abc", "included");
+  TRACE_EVENT_INSTANT0("inc_wildcard_tag,other_tag", "included");
+  TRACE_EVENT_INSTANT0("non_included_tag , inc_wildcard_tag", "included");
   TRACE_EVENT_INSTANT0("inc_wildcard_", "included");
   TRACE_EVENT_INSTANT0("inc_wildchar_x_end", "included");
   TRACE_EVENT_INSTANT0("inc_wildchar_bla_end", "not_inc");
   TRACE_EVENT_INSTANT0("cat1", "not_inc");
   TRACE_EVENT_INSTANT0("cat2", "not_inc");
   EndTraceAndFlush();
   EXPECT_TRUE(FindMatchingValue("cat", "inc_wildcard_abc"));
+  EXPECT_TRUE(FindMatchingValue("cat", "inc_wildcard_tag,other_tag"));
+  EXPECT_TRUE(FindMatchingValue("cat", "non_included_tag , inc_wildcard_tag"));
   EXPECT_TRUE(FindMatchingValue("cat", "inc_wildcard_"));
   EXPECT_TRUE(FindMatchingValue("cat", "inc_wildchar_x_end"));
   EXPECT_FALSE(FindMatchingValue("name", "not_inc"));
 
-  included_categories.clear();
+  included_tag_patterns.clear();
 
   // Exclude nonexistent category -> all events
   Clear();
-  excluded_categories.clear();
-  excluded_categories.push_back("not_found823564786");
-  TraceLog::GetInstance()->SetEnabled(empty_categories, excluded_categories);
+  excluded_tag_patterns.clear();
+  excluded_tag_patterns.push_back("not_found823564786");
+  TraceLog::GetInstance()->SetEnabled(empty_tag_patterns,
+                                      excluded_tag_patterns);
   TRACE_EVENT_INSTANT0("cat1", "name");
   TRACE_EVENT_INSTANT0("cat2", "name");
+  TRACE_EVENT_INSTANT0("tag1, tag2", "name");
   EndTraceAndFlush();
   EXPECT_TRUE(FindMatchingValue("cat", "cat1"));
   EXPECT_TRUE(FindMatchingValue("cat", "cat2"));
+  EXPECT_TRUE(FindMatchingValue("cat", "tag1, tag2"));
 
   // Exclude existent category -> only events of other categories
   Clear();
-  excluded_categories.clear();
-  excluded_categories.push_back("inc");
-  TraceLog::GetInstance()->SetEnabled(empty_categories, excluded_categories);
+  excluded_tag_patterns.clear();
+  excluded_tag_patterns.push_back("inc");
+  TraceLog::GetInstance()->SetEnabled(empty_tag_patterns,
+                                      excluded_tag_patterns);
   TRACE_EVENT_INSTANT0("inc", "name");
+  TRACE_EVENT_INSTANT0("inc2, inc", "name");
+  TRACE_EVENT_INSTANT0("inc, inc2", "name");
   TRACE_EVENT_INSTANT0("inc2", "name");
   EndTraceAndFlush();
   EXPECT_TRUE(FindMatchingValue("cat", "inc2"));
   EXPECT_FALSE(FindMatchingValue("cat", "inc"));
+  EXPECT_FALSE(FindMatchingValue("cat", "inc2, inc"));
+  EXPECT_FALSE(FindMatchingValue("cat", "inc, inc2"));
 
   // Exclude existent wildcard -> all categories not matching wildcard
   Clear();
-  excluded_categories.clear();
-  excluded_categories.push_back("inc_wildcard_*");
-  excluded_categories.push_back("inc_wildchar_?_end");
-  TraceLog::GetInstance()->SetEnabled(empty_categories, excluded_categories);
+  excluded_tag_patterns.clear();
+  excluded_tag_patterns.push_back("inc_wildcard_*");
+  excluded_tag_patterns.push_back("inc_wildchar_?_end");
+  TraceLog::GetInstance()->SetEnabled(empty_tag_patterns,
+                                      excluded_tag_patterns);
   TRACE_EVENT_INSTANT0("inc_wildcard_abc", "not_inc");
   TRACE_EVENT_INSTANT0("inc_wildcard_", "not_inc");
   TRACE_EVENT_INSTANT0("inc_wildchar_x_end", "not_inc");
   TRACE_EVENT_INSTANT0("inc_wildchar_bla_end", "included");
   TRACE_EVENT_INSTANT0("cat1", "included");
   TRACE_EVENT_INSTANT0("cat2", "included");
   EndTraceAndFlush();
   EXPECT_TRUE(FindMatchingValue("cat", "inc_wildchar_bla_end"));
   EXPECT_TRUE(FindMatchingValue("cat", "cat1"));
   EXPECT_TRUE(FindMatchingValue("cat", "cat2"));
@@ skipping 510 matching lines @@
   TraceLog::GetInstance()->SetDisabled();
 
   TRACE_EVENT_INSTANT1("category", "test", "a", a++);
   EXPECT_EQ(1, a);
 
   EndTraceAndFlush();
 }
 
 }  // namespace debug
 }  // namespace base