Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.

base/test/trace_event_analyzer_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/bind.h"
 #include "base/debug/trace_event_unittest.h"
 #include "base/test/trace_event_analyzer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 190 matching lines @@
   EXPECT_FALSE(event_arg1.Evaluate(other));
   EXPECT_FALSE(event_arg2.Evaluate(other));
   EXPECT_FALSE(event_has_other.Evaluate(other));
 }
 
 TEST_F(TraceEventAnalyzerTest, BooleanOperators) {
   ManualSetUp();
 
   BeginTracing();
   {
-    TRACE_EVENT_INSTANT1("cat1", "name1", "num", 1);
-    TRACE_EVENT_INSTANT1("cat1", "name2", "num", 2);
-    TRACE_EVENT_INSTANT1("cat2", "name3", "num", 3);
-    TRACE_EVENT_INSTANT1("cat2", "name4", "num", 4);
+    TRACE_EVENT_INSTANT1("cat1", "name1", TRACE_EVENT_SCOPE_THREAD, "num", 1);
+    TRACE_EVENT_INSTANT1("cat1", "name2", TRACE_EVENT_SCOPE_THREAD, "num", 2);
+    TRACE_EVENT_INSTANT1("cat2", "name3", TRACE_EVENT_SCOPE_THREAD, "num", 3);
+    TRACE_EVENT_INSTANT1("cat2", "name4", TRACE_EVENT_SCOPE_THREAD, "num", 4);
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(!!analyzer.get());
 
   TraceEventVector found;
 
   // ==
@@ skipping 61 matching lines @@
   EXPECT_STREQ("name2", found[0]->name.c_str());
   EXPECT_STREQ("name4", found[1]->name.c_str());
 }
 
 TEST_F(TraceEventAnalyzerTest, ArithmeticOperators) {
   ManualSetUp();
 
   BeginTracing();
   {
     // These events are searched for:
-    TRACE_EVENT_INSTANT2("cat1", "math1", "a", 10, "b", 5);
-    TRACE_EVENT_INSTANT2("cat1", "math2", "a", 10, "b", 10);
+    TRACE_EVENT_INSTANT2("cat1", "math1", TRACE_EVENT_SCOPE_THREAD,
+                         "a", 10, "b", 5);
+    TRACE_EVENT_INSTANT2("cat1", "math2", TRACE_EVENT_SCOPE_THREAD,
+                         "a", 10, "b", 10);
     // Extra events that never match, for noise:
-    TRACE_EVENT_INSTANT2("noise", "math3", "a", 1,  "b", 3);
-    TRACE_EVENT_INSTANT2("noise", "math4", "c", 10, "d", 5);
+    TRACE_EVENT_INSTANT2("noise", "math3", TRACE_EVENT_SCOPE_THREAD,
+                         "a", 1,  "b", 3);
+    TRACE_EVENT_INSTANT2("noise", "math4", TRACE_EVENT_SCOPE_THREAD,
+                         "c", 10, "d", 5);
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
 
   TraceEventVector found;
 
   // Verify that arithmetic operators function:
@@ skipping 31 matching lines @@
   analyzer->FindEvents(-Query::EventArg("b") == Query::Int(-10), &found);
   EXPECT_EQ(1u, found.size());
   EXPECT_STREQ("math2", found.front()->name.c_str());
 }
 
 TEST_F(TraceEventAnalyzerTest, StringPattern) {
   ManualSetUp();
 
   BeginTracing();
   {
-    TRACE_EVENT_INSTANT0("cat1", "name1");
-    TRACE_EVENT_INSTANT0("cat1", "name2");
-    TRACE_EVENT_INSTANT0("cat1", "no match");
-    TRACE_EVENT_INSTANT0("cat1", "name3x");
+    TRACE_EVENT_INSTANT0("cat1", "name1", TRACE_EVENT_SCOPE_THREAD);
+    TRACE_EVENT_INSTANT0("cat1", "name2", TRACE_EVENT_SCOPE_THREAD);
+    TRACE_EVENT_INSTANT0("cat1", "no match", TRACE_EVENT_SCOPE_THREAD);
+    TRACE_EVENT_INSTANT0("cat1", "name3x", TRACE_EVENT_SCOPE_THREAD);
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
 
   TraceEventVector found;
 
   analyzer->FindEvents(Query::EventName() == Query::Pattern("name?"), &found);
@@ skipping 20 matching lines @@
   // We will search for events that have a duration of greater than 90% of the
   // sleep time, so that there is no flakiness.
   int duration_cutoff_us = (kSleepTime.InMicroseconds() * 9) / 10;
 
   BeginTracing();
   {
     TRACE_EVENT0("cat1", "name1"); // found by duration query
     TRACE_EVENT0("noise", "name2"); // not searched for, just noise
     {
       TRACE_EVENT0("cat2", "name3"); // found by duration query
-      TRACE_EVENT_INSTANT0("noise", "name4"); // not searched for, just noise
+      // next event not searched for, just noise
+      TRACE_EVENT_INSTANT0("noise", "name4", TRACE_EVENT_SCOPE_THREAD);
       base::debug::HighResSleepForTraceTest(kSleepTime);
       TRACE_EVENT0("cat2", "name5"); // not found (duration too short)
     }
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
   analyzer->AssociateBeginEndEvents();
@@ skipping 12 matching lines @@
 }
 
 // Test AssociateBeginEndEvents
 TEST_F(TraceEventAnalyzerTest, BeginEndAssocations) {
   ManualSetUp();
 
   BeginTracing();
   {
     TRACE_EVENT_END0("cat1", "name1"); // does not match out of order begin
     TRACE_EVENT0("cat1", "name2");
-    TRACE_EVENT_INSTANT0("cat1", "name3");
+    TRACE_EVENT_INSTANT0("cat1", "name3", TRACE_EVENT_SCOPE_THREAD);
     TRACE_EVENT_BEGIN0("cat1", "name1");
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
   analyzer->AssociateBeginEndEvents();
 
   TraceEventVector found;
@@ skipping 32 matching lines @@
 
 // Test AssociateAsyncBeginEndEvents
 TEST_F(TraceEventAnalyzerTest, AsyncBeginEndAssocations) {
   ManualSetUp();
 
   BeginTracing();
   {
     TRACE_EVENT_ASYNC_END0("cat1", "name1", 0xA); // no match / out of order
     TRACE_EVENT_ASYNC_BEGIN0("cat1", "name1", 0xB);
     TRACE_EVENT_ASYNC_BEGIN0("cat1", "name1", 0xC);
-    TRACE_EVENT_INSTANT0("cat1", "name1"); // noise
+    TRACE_EVENT_INSTANT0("cat1", "name1", TRACE_EVENT_SCOPE_THREAD); // noise
     TRACE_EVENT0("cat1", "name1"); // noise
     TRACE_EVENT_ASYNC_END0("cat1", "name1", 0xB);
     TRACE_EVENT_ASYNC_END0("cat1", "name1", 0xC);
     TRACE_EVENT_ASYNC_BEGIN0("cat1", "name1", 0xA); // no match / out of order
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
@@ skipping 59 matching lines @@
 }
 
 // Test that the TraceAnalyzer custom associations work.
 TEST_F(TraceEventAnalyzerTest, CustomAssociations) {
   ManualSetUp();
 
   // Add events that begin/end in pipelined ordering with unique ID parameter
   // to match up the begin/end pairs.
   BeginTracing();
   {
-    TRACE_EVENT_INSTANT1("cat1", "end", "id", 1);   // no begin match
-    TRACE_EVENT_INSTANT1("cat2", "begin", "id", 2); // end is cat4
-    TRACE_EVENT_INSTANT1("cat3", "begin", "id", 3); // end is cat5
-    TRACE_EVENT_INSTANT1("cat4", "end", "id", 2);
-    TRACE_EVENT_INSTANT1("cat5", "end", "id", 3);
-    TRACE_EVENT_INSTANT1("cat6", "begin", "id", 1); // no end match
+    // no begin match
+    TRACE_EVENT_INSTANT1("cat1", "end", TRACE_EVENT_SCOPE_THREAD, "id", 1);
+    // end is cat4
+    TRACE_EVENT_INSTANT1("cat2", "begin", TRACE_EVENT_SCOPE_THREAD, "id", 2);
+    // end is cat5
+    TRACE_EVENT_INSTANT1("cat3", "begin", TRACE_EVENT_SCOPE_THREAD, "id", 3);
+    TRACE_EVENT_INSTANT1("cat4", "end", TRACE_EVENT_SCOPE_THREAD, "id", 2);
+    TRACE_EVENT_INSTANT1("cat5", "end", TRACE_EVENT_SCOPE_THREAD, "id", 3);
+    // no end match
+    TRACE_EVENT_INSTANT1("cat6", "begin", TRACE_EVENT_SCOPE_THREAD, "id", 1);
   }
   EndTracing();
 
   scoped_ptr<TraceAnalyzer>
       analyzer(TraceAnalyzer::Create(output_.json_output));
   ASSERT_TRUE(analyzer.get());
 
   // begin, end, and match queries to find proper begin/end pairs.
   Query begin(Query::EventName() == Query::String("begin"));
   Query end(Query::EventName() == Query::String("end"));
@@ skipping 242 matching lines @@
   EXPECT_EQ(num_events, CountMatches(event_ptrs, Query::Bool(true)));
   EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, Query::Bool(true),
                                          1, num_events));
   EXPECT_EQ(1u, CountMatches(event_ptrs, query_one));
   EXPECT_EQ(num_events - 1, CountMatches(event_ptrs, !query_one));
   EXPECT_EQ(num_named, CountMatches(event_ptrs, query_named));
 }
 
 
 }  // namespace trace_analyzer