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

The scope indicates how long the vertical line should be in the tracing UI. It
can be global (full screen), process or thread (fill those tracks), or local
(the original style for INSTANT).


BUG=None


Review URL: https://chromiumcodereview.appspot.com/12252058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190577 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 30 insertions, 21 deletions

diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index 6004341..33cacbf 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -208,10 +208,10 @@ TEST_F(TraceEventAnalyzerTest, BooleanOperators) {
 
   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();
 
@@ -293,11 +293,15 @@ TEST_F(TraceEventAnalyzerTest, ArithmeticOperators) {
   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();
 
@@ -349,10 +353,10 @@ TEST_F(TraceEventAnalyzerTest, StringPattern) {
 
   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();
 
@@ -393,7 +397,8 @@ TEST_F(TraceEventAnalyzerTest, Duration) {
     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)
     }
@@ -426,7 +431,7 @@ TEST_F(TraceEventAnalyzerTest, BeginEndAssocations) {
   {
     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();
@@ -479,7 +484,7 @@ TEST_F(TraceEventAnalyzerTest, AsyncBeginEndAssocations) {
     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);
@@ -559,12 +564,16 @@ TEST_F(TraceEventAnalyzerTest, CustomAssociations) {
   // 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();