diff options
| -rw-r--r-- | base/test/trace_event_analyzer.cc | 28 | ||||
| -rw-r--r-- | base/test/trace_event_analyzer.h | 168 | ||||
| -rw-r--r-- | base/test/trace_event_analyzer_unittest.cc | 174 | ||||
| -rw-r--r-- | chrome/test/gpu/gpu_feature_browsertest.cc | 7 | ||||
| -rw-r--r-- | chrome/test/perf/frame_rate/frame_rate_tests.cc | 11 | ||||
| -rw-r--r-- | chrome/test/perf/rendering/latency_tests.cc | 35 | ||||
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 12 |
7 files changed, 239 insertions, 196 deletions
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc index a60250a..1341cc0 100644 --- a/base/test/trace_event_analyzer.cc +++ b/base/test/trace_event_analyzer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -674,26 +674,26 @@ bool TraceAnalyzer::SetEvents(const std::string& json_events) { } void TraceAnalyzer::AssociateBeginEndEvents() { - using namespace trace_analyzer; + using trace_analyzer::Query; - Query begin(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_BEGIN)); - Query end(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_END)); - Query match(Query(EVENT_NAME) == Query(OTHER_NAME) && - Query(EVENT_CATEGORY) == Query(OTHER_CATEGORY) && - Query(EVENT_TID) == Query(OTHER_TID) && - Query(EVENT_PID) == Query(OTHER_PID)); + Query begin(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_BEGIN)); + Query end(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_END)); + Query match(Query::EventName() == Query::OtherName() && + Query::EventCategory() == Query::OtherCategory() && + Query::EventTid() == Query::OtherTid() && + Query::EventPid() == Query::OtherPid()); AssociateEvents(begin, end, match); } void TraceAnalyzer::AssociateStartFinishEvents() { - using namespace trace_analyzer; + using trace_analyzer::Query; - Query begin(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_START)); - Query end(Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_FINISH)); - Query match(Query(EVENT_NAME) == Query(OTHER_NAME) && - Query(EVENT_CATEGORY) == Query(OTHER_CATEGORY) && - Query(EVENT_ID) == Query(OTHER_ID)); + Query begin(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_START)); + Query end(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_FINISH)); + Query match(Query::EventName() == Query::OtherName() && + Query::EventCategory() == Query::OtherCategory() && + Query::EventId() == Query::OtherId()); AssociateEvents(begin, end, match); } diff --git a/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h index 8f25cd8..949721b 100644 --- a/base/test/trace_event_analyzer.h +++ b/base/test/trace_event_analyzer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -172,70 +172,15 @@ struct TraceEvent { typedef std::vector<const TraceEvent*> TraceEventVector; -// Pass these values to Query to compare with the corresponding member of a -// TraceEvent. Unless otherwise specfied, the usage is Query(ENUM_MEMBER). -enum TraceEventMember { - EVENT_INVALID, - // Use these to access the event members: - EVENT_PID, - EVENT_TID, - // Return the timestamp of the event in microseconds since epoch. - EVENT_TIME, - // Return the absolute time between event and other event in microseconds. - // Only works for events with associated BEGIN/END: Query(EVENT_HAS_OTHER). - EVENT_DURATION, - EVENT_PHASE, - EVENT_CATEGORY, - EVENT_NAME, - EVENT_ID, - - // Evaluates to true if arg exists and is a string. - // Usage: Query(EVENT_HAS_STRING_ARG, "arg_name") - EVENT_HAS_STRING_ARG, - // Evaluates to true if arg exists and is a number. - // Number arguments include types double, int and bool. - // Usage: Query(EVENT_HAS_NUMBER_ARG, "arg_name") - EVENT_HAS_NUMBER_ARG, - // Evaluates to arg value (string or number). - // Usage: Query(EVENT_ARG, "arg_name") - EVENT_ARG, - // Return true if associated event exists. - // (Typically BEGIN for END or END for BEGIN). - EVENT_HAS_OTHER, - - // Access the associated other_event's members: - OTHER_PID, - OTHER_TID, - OTHER_TIME, - OTHER_PHASE, - OTHER_CATEGORY, - OTHER_NAME, - OTHER_ID, - - // Evaluates to true if arg exists and is a string. - // Usage: Query(EVENT_HAS_STRING_ARG, "arg_name") - OTHER_HAS_STRING_ARG, - // Evaluates to true if arg exists and is a number. - // Number arguments include types double, int and bool. - // Usage: Query(EVENT_HAS_NUMBER_ARG, "arg_name") - OTHER_HAS_NUMBER_ARG, - // Evaluates to arg value (string or number). - // Usage: Query(EVENT_ARG, "arg_name") - OTHER_ARG, -}; - class Query { public: - // Compare with the given member. - Query(TraceEventMember member); - - // Compare with the given member argument value. - Query(TraceEventMember member, const std::string& arg_name); - Query(const Query& query); ~Query(); + //////////////////////////////////////////////////////////////// + // Query literal values + // Compare with the given string. static Query String(const std::string& str); @@ -254,6 +199,76 @@ class Query { // Example: Query(EVENT_NAME) == Query::Pattern("MyEvent*") static Query Pattern(const std::string& pattern); + //////////////////////////////////////////////////////////////// + // Query event members + + static Query EventPid() { return Query(EVENT_PID); } + + static Query EventTid() { return Query(EVENT_TID); } + + // Return the timestamp of the event in microseconds since epoch. + static Query EventTime() { return Query(EVENT_TIME); } + + // Return the absolute time between event and other event in microseconds. + // Only works if Query::EventHasOther() == true. + static Query EventDuration() { return Query(EVENT_DURATION); } + + static Query EventPhase() { return Query(EVENT_PHASE); } + + static Query EventCategory() { return Query(EVENT_CATEGORY); } + + static Query EventName() { return Query(EVENT_NAME); } + + static Query EventId() { return Query(EVENT_ID); } + + // Evaluates to true if arg exists and is a string. + static Query EventHasStringArg(const std::string& arg_name) { + return Query(EVENT_HAS_STRING_ARG, arg_name); + } + + // Evaluates to true if arg exists and is a number. + // Number arguments include types double, int and bool. + static Query EventHasNumberArg(const std::string& arg_name) { + return Query(EVENT_HAS_NUMBER_ARG, arg_name); + } + + // Evaluates to arg value (string or number). + static Query EventArg(const std::string& arg_name) { + return Query(EVENT_ARG, arg_name); + } + + // Return true if associated event exists. + static Query EventHasOther() { return Query(EVENT_HAS_OTHER); } + + // Access the associated other_event's members: + + static Query OtherPid() { return Query(OTHER_PID); } + + static Query OtherTid() { return Query(OTHER_TID); } + + static Query OtherTime() { return Query(OTHER_TIME); } + + static Query OtherPhase() { return Query(OTHER_PHASE); } + + static Query OtherCategory() { return Query(OTHER_CATEGORY); } + + static Query OtherName() { return Query(OTHER_NAME); } + + static Query OtherId() { return Query(OTHER_ID); } + + static Query OtherHasStringArg(const std::string& arg_name) { + return Query(OTHER_HAS_STRING_ARG, arg_name); + } + + static Query OtherHasNumberArg(const std::string& arg_name) { + return Query(OTHER_HAS_NUMBER_ARG, arg_name); + } + + static Query OtherArg(const std::string& arg_name) { + return Query(OTHER_ARG, arg_name); + } + + //////////////////////////////////////////////////////////////// // Common queries: // Find BEGIN events that have a corresponding END event. @@ -285,6 +300,9 @@ class Query { (Query(EVENT_TID) != Query(OTHER_TID)); } + //////////////////////////////////////////////////////////////// + // Operators: + // Boolean operators: Query operator==(const Query& rhs) const; Query operator!=(const Query& rhs) const; @@ -311,6 +329,32 @@ class Query { bool Evaluate(const TraceEvent& event) const; private: + enum TraceEventMember { + EVENT_INVALID, + EVENT_PID, + EVENT_TID, + EVENT_TIME, + EVENT_DURATION, + EVENT_PHASE, + EVENT_CATEGORY, + EVENT_NAME, + EVENT_ID, + EVENT_HAS_STRING_ARG, + EVENT_HAS_NUMBER_ARG, + EVENT_ARG, + EVENT_HAS_OTHER, + OTHER_PID, + OTHER_TID, + OTHER_TIME, + OTHER_PHASE, + OTHER_CATEGORY, + OTHER_NAME, + OTHER_ID, + OTHER_HAS_STRING_ARG, + OTHER_HAS_NUMBER_ARG, + OTHER_ARG, + }; + enum Operator { OP_INVALID, // Boolean operators: @@ -340,6 +384,12 @@ class Query { QUERY_STRING }; + // Compare with the given member. + Query(TraceEventMember member); + + // Compare with the given member argument value. + Query(TraceEventMember member, const std::string& arg_name); + // Compare with the given string. Query(const std::string& str); diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc index 4c7c73c..ccce3f3 100644 --- a/base/test/trace_event_analyzer_unittest.cc +++ b/base/test/trace_event_analyzer_unittest.cc @@ -55,7 +55,6 @@ void TraceEventAnalyzerTest::EndTracing() { } // namespace TEST_F(TraceEventAnalyzerTest, NoEvents) { - using namespace trace_analyzer; ManualSetUp(); // Create an empty JSON event string: @@ -73,7 +72,6 @@ TEST_F(TraceEventAnalyzerTest, NoEvents) { } TEST_F(TraceEventAnalyzerTest, TraceEvent) { - using namespace trace_analyzer; ManualSetUp(); int int_num = 2; @@ -103,7 +101,6 @@ TEST_F(TraceEventAnalyzerTest, TraceEvent) { } TEST_F(TraceEventAnalyzerTest, QueryEventMember) { - using namespace trace_analyzer; ManualSetUp(); TraceEvent event; @@ -133,36 +130,36 @@ TEST_F(TraceEventAnalyzerTest, QueryEventMember) { ASSERT_TRUE(event.has_other_event()); double duration = event.GetAbsTimeToOtherEvent(); - Query event_pid = (Query(EVENT_PID) == Query::Int(event.thread.process_id)); - Query event_tid = (Query(EVENT_TID) == Query::Int(event.thread.thread_id)); - Query event_time = (Query(EVENT_TIME) == Query::Double(event.timestamp)); - Query event_duration = (Query(EVENT_DURATION) == Query::Double(duration)); - Query event_phase = (Query(EVENT_PHASE) == Query::Phase(event.phase)); + Query event_pid = (Query::EventPid() == Query::Int(event.thread.process_id)); + Query event_tid = (Query::EventTid() == Query::Int(event.thread.thread_id)); + Query event_time = (Query::EventTime() == Query::Double(event.timestamp)); + Query event_duration = (Query::EventDuration() == Query::Double(duration)); + Query event_phase = (Query::EventPhase() == Query::Phase(event.phase)); Query event_category = - (Query(EVENT_CATEGORY) == Query::String(event.category)); - Query event_name = (Query(EVENT_NAME) == Query::String(event.name)); - Query event_id = (Query(EVENT_ID) == Query::String(event.id)); - Query event_has_arg1 = Query(EVENT_HAS_NUMBER_ARG, "num"); - Query event_has_arg2 = Query(EVENT_HAS_STRING_ARG, "str"); + (Query::EventCategory() == Query::String(event.category)); + Query event_name = (Query::EventName() == Query::String(event.name)); + Query event_id = (Query::EventId() == Query::String(event.id)); + Query event_has_arg1 = Query::EventHasNumberArg("num"); + Query event_has_arg2 = Query::EventHasStringArg("str"); Query event_arg1 = - (Query(EVENT_ARG, "num") == Query::Double(event.arg_numbers["num"])); + (Query::EventArg("num") == Query::Double(event.arg_numbers["num"])); Query event_arg2 = - (Query(EVENT_ARG, "str") == Query::String(event.arg_strings["str"])); - Query event_has_other = Query(EVENT_HAS_OTHER); - Query other_pid = (Query(OTHER_PID) == Query::Int(other.thread.process_id)); - Query other_tid = (Query(OTHER_TID) == Query::Int(other.thread.thread_id)); - Query other_time = (Query(OTHER_TIME) == Query::Double(other.timestamp)); - Query other_phase = (Query(OTHER_PHASE) == Query::Phase(other.phase)); + (Query::EventArg("str") == Query::String(event.arg_strings["str"])); + Query event_has_other = Query::EventHasOther(); + Query other_pid = (Query::OtherPid() == Query::Int(other.thread.process_id)); + Query other_tid = (Query::OtherTid() == Query::Int(other.thread.thread_id)); + Query other_time = (Query::OtherTime() == Query::Double(other.timestamp)); + Query other_phase = (Query::OtherPhase() == Query::Phase(other.phase)); Query other_category = - (Query(OTHER_CATEGORY) == Query::String(other.category)); - Query other_name = (Query(OTHER_NAME) == Query::String(other.name)); - Query other_id = (Query(OTHER_ID) == Query::String(other.id)); - Query other_has_arg1 = Query(OTHER_HAS_NUMBER_ARG, "num2"); - Query other_has_arg2 = Query(OTHER_HAS_STRING_ARG, "str2"); + (Query::OtherCategory() == Query::String(other.category)); + Query other_name = (Query::OtherName() == Query::String(other.name)); + Query other_id = (Query::OtherId() == Query::String(other.id)); + Query other_has_arg1 = Query::OtherHasNumberArg("num2"); + Query other_has_arg2 = Query::OtherHasStringArg("str2"); Query other_arg1 = - (Query(OTHER_ARG, "num2") == Query::Double(other.arg_numbers["num2"])); + (Query::OtherArg("num2") == Query::Double(other.arg_numbers["num2"])); Query other_arg2 = - (Query(OTHER_ARG, "str2") == Query::String(other.arg_strings["str2"])); + (Query::OtherArg("str2") == Query::String(other.arg_strings["str2"])); EXPECT_TRUE(event_pid.Evaluate(event)); EXPECT_TRUE(event_tid.Evaluate(event)); @@ -207,7 +204,6 @@ TEST_F(TraceEventAnalyzerTest, QueryEventMember) { } TEST_F(TraceEventAnalyzerTest, BooleanOperators) { - using namespace trace_analyzer; ManualSetUp(); BeginTracing(); @@ -227,72 +223,71 @@ TEST_F(TraceEventAnalyzerTest, BooleanOperators) { // == - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat1"), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat1"), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name2", found[1]->name.c_str()); - analyzer->FindEvents(Query(EVENT_ARG, "num") == Query::Int(2), &found); + analyzer->FindEvents(Query::EventArg("num") == Query::Int(2), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("name2", found[0]->name.c_str()); // != - analyzer->FindEvents(Query(EVENT_CATEGORY) != Query::String("cat1"), &found); + analyzer->FindEvents(Query::EventCategory() != Query::String("cat1"), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name3", found[0]->name.c_str()); EXPECT_STREQ("name4", found[1]->name.c_str()); - analyzer->FindEvents(Query(EVENT_ARG, "num") != Query::Int(2), &found); + analyzer->FindEvents(Query::EventArg("num") != Query::Int(2), &found); ASSERT_EQ(3u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name3", found[1]->name.c_str()); EXPECT_STREQ("name4", found[2]->name.c_str()); // < - analyzer->FindEvents(Query(EVENT_ARG, "num") < Query::Int(2), &found); + analyzer->FindEvents(Query::EventArg("num") < Query::Int(2), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); // <= - analyzer->FindEvents(Query(EVENT_ARG, "num") <= Query::Int(2), &found); + analyzer->FindEvents(Query::EventArg("num") <= Query::Int(2), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name2", found[1]->name.c_str()); // > - analyzer->FindEvents(Query(EVENT_ARG, "num") > Query::Int(3), &found); + analyzer->FindEvents(Query::EventArg("num") > Query::Int(3), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("name4", found[0]->name.c_str()); // >= - analyzer->FindEvents(Query(EVENT_ARG, "num") >= Query::Int(4), &found); + analyzer->FindEvents(Query::EventArg("num") >= Query::Int(4), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("name4", found[0]->name.c_str()); // && - analyzer->FindEvents(Query(EVENT_NAME) != Query::String("name1") && - Query(EVENT_ARG, "num") < Query::Int(3), &found); + analyzer->FindEvents(Query::EventName() != Query::String("name1") && + Query::EventArg("num") < Query::Int(3), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("name2", found[0]->name.c_str()); // || - analyzer->FindEvents(Query(EVENT_NAME) == Query::String("name1") || - Query(EVENT_ARG, "num") == Query::Int(3), &found); + analyzer->FindEvents(Query::EventName() == Query::String("name1") || + Query::EventArg("num") == Query::Int(3), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name3", found[1]->name.c_str()); // ! - analyzer->FindEvents(!(Query(EVENT_NAME) == Query::String("name1") || - Query(EVENT_ARG, "num") == Query::Int(3)), &found); + analyzer->FindEvents(!(Query::EventName() == Query::String("name1") || + Query::EventArg("num") == Query::Int(3)), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name2", found[0]->name.c_str()); EXPECT_STREQ("name4", found[1]->name.c_str()); } TEST_F(TraceEventAnalyzerTest, ArithmeticOperators) { - using namespace trace_analyzer; ManualSetUp(); BeginTracing(); @@ -315,42 +310,41 @@ TEST_F(TraceEventAnalyzerTest, ArithmeticOperators) { // Verify that arithmetic operators function: // + - analyzer->FindEvents(Query(EVENT_ARG, "a") + Query(EVENT_ARG, "b") == + analyzer->FindEvents(Query::EventArg("a") + Query::EventArg("b") == Query::Int(20), &found); EXPECT_EQ(1u, found.size()); EXPECT_STREQ("math2", found.front()->name.c_str()); // - - analyzer->FindEvents(Query(EVENT_ARG, "a") - Query(EVENT_ARG, "b") == + analyzer->FindEvents(Query::EventArg("a") - Query::EventArg("b") == Query::Int(5), &found); EXPECT_EQ(1u, found.size()); EXPECT_STREQ("math1", found.front()->name.c_str()); // * - analyzer->FindEvents(Query(EVENT_ARG, "a") * Query(EVENT_ARG, "b") == + analyzer->FindEvents(Query::EventArg("a") * Query::EventArg("b") == Query::Int(50), &found); EXPECT_EQ(1u, found.size()); EXPECT_STREQ("math1", found.front()->name.c_str()); // / - analyzer->FindEvents(Query(EVENT_ARG, "a") / Query(EVENT_ARG, "b") == + analyzer->FindEvents(Query::EventArg("a") / Query::EventArg("b") == Query::Int(2), &found); EXPECT_EQ(1u, found.size()); EXPECT_STREQ("math1", found.front()->name.c_str()); // % - analyzer->FindEvents(Query(EVENT_ARG, "a") % Query(EVENT_ARG, "b") == + analyzer->FindEvents(Query::EventArg("a") % Query::EventArg("b") == Query::Int(0), &found); EXPECT_EQ(2u, found.size()); // - (negate) - analyzer->FindEvents(-Query(EVENT_ARG, "b") == Query::Int(-10), &found); + 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) { - using namespace trace_analyzer; ManualSetUp(); BeginTracing(); @@ -368,25 +362,24 @@ TEST_F(TraceEventAnalyzerTest, StringPattern) { TraceEventVector found; - analyzer->FindEvents(Query(EVENT_NAME) == Query::Pattern("name?"), &found); + analyzer->FindEvents(Query::EventName() == Query::Pattern("name?"), &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name2", found[1]->name.c_str()); - analyzer->FindEvents(Query(EVENT_NAME) == Query::Pattern("name*"), &found); + analyzer->FindEvents(Query::EventName() == Query::Pattern("name*"), &found); ASSERT_EQ(3u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name2", found[1]->name.c_str()); EXPECT_STREQ("name3x", found[2]->name.c_str()); - analyzer->FindEvents(Query(EVENT_NAME) != Query::Pattern("name*"), &found); + analyzer->FindEvents(Query::EventName() != Query::Pattern("name*"), &found); ASSERT_EQ(1u, found.size()); EXPECT_STREQ("no match", found[0]->name.c_str()); } // Test that duration queries work. TEST_F(TraceEventAnalyzerTest, Duration) { - using namespace trace_analyzer; ManualSetUp(); const base::TimeDelta kSleepTime = base::TimeDelta::FromMilliseconds(200); @@ -413,11 +406,13 @@ TEST_F(TraceEventAnalyzerTest, Duration) { analyzer->AssociateBeginEndEvents(); TraceEventVector found; - analyzer->FindEvents(Query::MatchBeginWithEnd() && - Query(EVENT_DURATION) > Query::Int(duration_cutoff_us) && - (Query(EVENT_CATEGORY) == Query::String("cat1") || - Query(EVENT_CATEGORY) == Query::String("cat2") || - Query(EVENT_CATEGORY) == Query::String("cat3")), &found); + analyzer->FindEvents( + Query::MatchBeginWithEnd() && + Query::EventDuration() > Query::Int(duration_cutoff_us) && + (Query::EventCategory() == Query::String("cat1") || + Query::EventCategory() == Query::String("cat2") || + Query::EventCategory() == Query::String("cat3")), + &found); ASSERT_EQ(2u, found.size()); EXPECT_STREQ("name1", found[0]->name.c_str()); EXPECT_STREQ("name3", found[1]->name.c_str()); @@ -425,7 +420,6 @@ TEST_F(TraceEventAnalyzerTest, Duration) { // Test AssociateBeginEndEvents TEST_F(TraceEventAnalyzerTest, BeginEndAssocations) { - using namespace trace_analyzer; ManualSetUp(); BeginTracing(); @@ -450,7 +444,6 @@ TEST_F(TraceEventAnalyzerTest, BeginEndAssocations) { // Test MergeAssociatedEventArgs TEST_F(TraceEventAnalyzerTest, MergeAssociatedEventArgs) { - using namespace trace_analyzer; ManualSetUp(); const char* arg_string = "arg_string"; @@ -466,8 +459,8 @@ TEST_F(TraceEventAnalyzerTest, MergeAssociatedEventArgs) { analyzer->AssociateBeginEndEvents(); TraceEventVector found; - analyzer->FindEvents(Query(EVENT_NAME) == Query::String("name1") && - Query(EVENT_PHASE) == Query::Phase(TRACE_EVENT_PHASE_END), &found); + analyzer->FindEvents(Query::EventName() == Query::String("name1") && + Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_END), &found); ASSERT_EQ(1u, found.size()); std::string arg_actual; EXPECT_FALSE(found[0]->GetArgAsString("arg", &arg_actual)); @@ -479,7 +472,6 @@ TEST_F(TraceEventAnalyzerTest, MergeAssociatedEventArgs) { // Test AssociateStartFinishEvents TEST_F(TraceEventAnalyzerTest, StartFinishAssocations) { - using namespace trace_analyzer; ManualSetUp(); BeginTracing(); @@ -509,7 +501,6 @@ TEST_F(TraceEventAnalyzerTest, StartFinishAssocations) { // Test that the TraceAnalyzer custom associations work. TEST_F(TraceEventAnalyzerTest, CustomAssociations) { - using namespace trace_analyzer; ManualSetUp(); // Add events that begin/end in pipelined ordering with unique ID parameter @@ -530,52 +521,51 @@ TEST_F(TraceEventAnalyzerTest, CustomAssociations) { ASSERT_TRUE(analyzer.get()); // begin, end, and match queries to find proper begin/end pairs. - Query begin(Query(EVENT_NAME) == Query::String("begin")); - Query end(Query(EVENT_NAME) == Query::String("end")); - Query match(Query(EVENT_ARG, "id") == Query(OTHER_ARG, "id")); + Query begin(Query::EventName() == Query::String("begin")); + Query end(Query::EventName() == Query::String("end")); + Query match(Query::EventArg("id") == Query::OtherArg("id")); analyzer->AssociateEvents(begin, end, match); TraceEventVector found; // cat1 has no other_event. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat1") && - Query(EVENT_HAS_OTHER), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat1") && + Query::EventHasOther(), &found); EXPECT_EQ(0u, found.size()); // cat1 has no other_event. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat1") && - !Query(EVENT_HAS_OTHER), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat1") && + !Query::EventHasOther(), &found); EXPECT_EQ(1u, found.size()); // cat6 has no other_event. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat6") && - !Query(EVENT_HAS_OTHER), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat6") && + !Query::EventHasOther(), &found); EXPECT_EQ(1u, found.size()); // cat2 and cat4 are a associated. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat2") && - Query(OTHER_CATEGORY) == Query::String("cat4"), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat2") && + Query::OtherCategory() == Query::String("cat4"), &found); EXPECT_EQ(1u, found.size()); // cat4 and cat2 are a associated. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat4") && - Query(OTHER_CATEGORY) == Query::String("cat2"), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat4") && + Query::OtherCategory() == Query::String("cat2"), &found); EXPECT_EQ(1u, found.size()); // cat3 and cat5 are a associated. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat3") && - Query(OTHER_CATEGORY) == Query::String("cat5"), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat3") && + Query::OtherCategory() == Query::String("cat5"), &found); EXPECT_EQ(1u, found.size()); // cat5 and cat3 are a associated. - analyzer->FindEvents(Query(EVENT_CATEGORY) == Query::String("cat5") && - Query(OTHER_CATEGORY) == Query::String("cat3"), &found); + analyzer->FindEvents(Query::EventCategory() == Query::String("cat5") && + Query::OtherCategory() == Query::String("cat3"), &found); EXPECT_EQ(1u, found.size()); } // Verify that Query literals and types are properly casted. TEST_F(TraceEventAnalyzerTest, Literals) { - using namespace trace_analyzer; ManualSetUp(); // Since these queries don't refer to the event data, the dummy event below @@ -597,8 +587,6 @@ TEST_F(TraceEventAnalyzerTest, Literals) { // Test GetRateStats. TEST_F(TraceEventAnalyzerTest, RateStats) { - using namespace trace_analyzer; - std::vector<TraceEvent> events; events.reserve(100); TraceEventVector event_ptrs; @@ -640,8 +628,6 @@ TEST_F(TraceEventAnalyzerTest, RateStats) { // Test FindFirstOf and FindLastOf. TEST_F(TraceEventAnalyzerTest, FindOf) { - using namespace trace_analyzer; - size_t num_events = 100; size_t index = 0; TraceEventVector event_ptrs; @@ -656,7 +642,7 @@ TEST_F(TraceEventAnalyzerTest, FindOf) { event_ptrs.push_back(&events[i]); size_t bam_index = num_events/2; events[bam_index].name = "bam"; - Query query_bam = Query(EVENT_NAME) == Query::String(events[bam_index].name); + Query query_bam = Query::EventName() == Query::String(events[bam_index].name); // FindFirstOf EXPECT_FALSE(FindFirstOf(event_ptrs, Query::Bool(false), 0, &index)); @@ -688,8 +674,6 @@ TEST_F(TraceEventAnalyzerTest, FindOf) { // Test FindClosest. TEST_F(TraceEventAnalyzerTest, FindClosest) { - using namespace trace_analyzer; - size_t index_1 = 0; size_t index_2 = 0; TraceEventVector event_ptrs; @@ -708,8 +692,8 @@ TEST_F(TraceEventAnalyzerTest, FindClosest) { events[0].name = "one"; events[2].name = "two"; events[4].name = "three"; - Query query_named = Query(EVENT_NAME) != Query::String(""); - Query query_one = Query(EVENT_NAME) == Query::String("one"); + Query query_named = Query::EventName() != Query::String(""); + Query query_one = Query::EventName() == Query::String("one"); // Only one event matches query_one, so two closest can't be found. EXPECT_FALSE(FindClosest(event_ptrs, query_one, 0, &index_1, &index_2)); @@ -732,8 +716,6 @@ TEST_F(TraceEventAnalyzerTest, FindClosest) { // Test CountMatches. TEST_F(TraceEventAnalyzerTest, CountMatches) { - using namespace trace_analyzer; - TraceEventVector event_ptrs; EXPECT_EQ(0u, CountMatches(event_ptrs, Query::Bool(true), 0, 10)); @@ -746,8 +728,8 @@ TEST_F(TraceEventAnalyzerTest, CountMatches) { events[0].name = "one"; events[2].name = "two"; events[4].name = "three"; - Query query_named = Query(EVENT_NAME) != Query::String(""); - Query query_one = Query(EVENT_NAME) == Query::String("one"); + Query query_named = Query::EventName() != Query::String(""); + Query query_one = Query::EventName() == Query::String("one"); EXPECT_EQ(0u, CountMatches(event_ptrs, Query::Bool(false))); EXPECT_EQ(num_events, CountMatches(event_ptrs, Query::Bool(true))); diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc index 37758cb..4c9a6fa 100644 --- a/chrome/test/gpu/gpu_feature_browsertest.cc +++ b/chrome/test/gpu/gpu_feature_browsertest.cc @@ -90,7 +90,8 @@ class GpuFeatureTest : public InProcessBrowserTest { } void RunTest(const FilePath& url, GpuResultFlags expectations) { - using namespace trace_analyzer; + using trace_analyzer::Query; + using trace_analyzer::TraceAnalyzer; ASSERT_TRUE(tracing::BeginTracing("test_gpu")); @@ -102,7 +103,7 @@ class GpuFeatureTest : public InProcessBrowserTest { scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events)); analyzer->AssociateBeginEndEvents(); - TraceEventVector events; + trace_analyzer::TraceEventVector events; // This measurement is flaky, because the GPU process is sometimes // started before the test (always with force-compositing-mode on CrOS). @@ -113,7 +114,7 @@ class GpuFeatureTest : public InProcessBrowserTest { // Check for swap buffers if expected: if (expectations & EXPECT_GPU_SWAP_BUFFERS) { - EXPECT_GT(analyzer->FindEvents(Query(EVENT_NAME) == + EXPECT_GT(analyzer->FindEvents(Query::EventName() == Query::String("SwapBuffers"), &events), size_t(0)); } diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc index d43efcf..631f8f7 100644 --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -121,15 +121,16 @@ class FrameRateTest } bool DidRunOnGpu(const std::string& json_events) { - using namespace trace_analyzer; + using trace_analyzer::Query; + using trace_analyzer::TraceAnalyzer; // Check trace for GPU accleration. scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events)); gfx::GLImplementation gl_impl = gfx::kGLImplementationNone; - const TraceEvent* gpu_event = analyzer->FindOneEvent( - Query(EVENT_NAME) == Query::String("SwapBuffers") && - Query(EVENT_HAS_NUMBER_ARG, "GLImpl")); + const trace_analyzer::TraceEvent* gpu_event = analyzer->FindOneEvent( + Query::EventName() == Query::String("SwapBuffers") && + Query::EventHasNumberArg("glimpl")); if (gpu_event) gl_impl = static_cast<gfx::GLImplementation>( gpu_event->GetKnownArgAsInt("GLImpl")); diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc index 63dba6c..de0f781 100644 --- a/chrome/test/perf/rendering/latency_tests.cc +++ b/chrome/test/perf/rendering/latency_tests.cc @@ -62,7 +62,14 @@ namespace { -using namespace trace_analyzer; +using trace_analyzer::CountMatches; +using trace_analyzer::FindClosest; +using trace_analyzer::FindLastOf; +using trace_analyzer::RateStats; +using trace_analyzer::Query; +using trace_analyzer::TraceAnalyzer; +using trace_analyzer::TraceEvent; +using trace_analyzer::TraceEventVector; enum LatencyTestMode { kWebGL, @@ -96,7 +103,7 @@ class LatencyTest public ::testing::WithParamInterface<int> { public: LatencyTest() : - query_instant_(Query(EVENT_PHASE) == + query_instant_(Query::EventPhase() == Query::Phase(TRACE_EVENT_PHASE_INSTANT)), // These queries are initialized in RunTest. query_swaps_(Query::Bool(false)), @@ -232,27 +239,27 @@ void LatencyTest::RunTest(LatencyTestMode mode, // Construct queries for searching trace events via TraceAnalyzer. if (mode_ == kWebGL) { query_swaps_ = query_instant_ && - Query(EVENT_NAME) == Query::String("SwapBuffers") && - Query(EVENT_ARG, "width") != Query::Int(kWebGLCanvasWidth); + Query::EventName() == Query::String("SwapBuffers") && + Query::EventArg("width") != Query::Int(kWebGLCanvasWidth); } else if (mode_ == kSoftware) { // Software updates need to have x=0 and y=0 to contain the input color. query_swaps_ = query_instant_ && - Query(EVENT_NAME) == Query::String("UpdateRect") && - Query(EVENT_ARG, "x+y") == Query::Int(0); + Query::EventName() == Query::String("UpdateRect") && + Query::EventArg("x+y") == Query::Int(0); } query_inputs_ = query_instant_ && - Query(EVENT_NAME) == Query::String("MouseEventBegin"); + Query::EventName() == Query::String("MouseEventBegin"); query_blits_ = query_instant_ && - Query(EVENT_NAME) == Query::String("DoBlit") && - Query(EVENT_ARG, "width") == Query::Int(kWebGLCanvasWidth); + Query::EventName() == Query::String("DoBlit") && + Query::EventArg("width") == Query::Int(kWebGLCanvasWidth); query_clears_ = query_instant_ && - Query(EVENT_NAME) == Query::String("DoClear") && - Query(EVENT_ARG, "green") == Query::Int(kClearColorGreen); + Query::EventName() == Query::String("DoClear") && + Query::EventArg("green") == Query::Int(kClearColorGreen); Query query_width_swaps = query_swaps_; if (mode_ == kSoftware) { query_width_swaps = query_instant_ && - Query(EVENT_NAME) == Query::String("UpdateRectWidth") && - Query(EVENT_ARG, "width") > Query::Int(kWebGLCanvasWidth); + Query::EventName() == Query::String("UpdateRectWidth") && + Query::EventArg("width") > Query::Int(kWebGLCanvasWidth); } // Set path to test html. @@ -439,7 +446,7 @@ double LatencyTest::CalculateLatency() { // Find the corresponding mouse input. size_t input_pos = 0; Query query_mouse_event = query_inputs_ && - Query(EVENT_ARG, "x") == Query::Int(mouse_x); + Query::EventArg("x") == Query::Int(mouse_x); EXPECT_TRUE(FindLastOf(events, query_mouse_event, i, &input_pos)); // Step 4: Find the nearest onscreen SwapBuffers to this input event. diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 5f7597c..8e764e4 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -71,7 +71,9 @@ class ThroughputTest : public BrowserPerfTest { } void RunTest(const std::string& test_name, ThroughputTestFlags flags) { - using namespace trace_analyzer; + using trace_analyzer::Query; + using trace_analyzer::TraceAnalyzer; + using trace_analyzer::TraceEventVector; if (use_gpu_ && !IsGpuAvailable()) { LOG(WARNING) << "Test skipped: requires gpu. Pass --enable-gpu on the " @@ -108,7 +110,7 @@ class ThroughputTest : public BrowserPerfTest { // Check if GPU is rendering: analyzer.reset(TraceAnalyzer::Create(json_events)); - bool ran_on_gpu = (analyzer->FindEvents(Query(EVENT_NAME) == + bool ran_on_gpu = (analyzer->FindEvents(Query::EventName() == Query::String("SwapBuffers"), &events_gpu) > 0u); LOG(INFO) << "Mode: " << (ran_on_gpu ? "GPU" : "Software"); EXPECT_EQ(use_gpu_, ran_on_gpu); @@ -122,8 +124,8 @@ class ThroughputTest : public BrowserPerfTest { // Search for frame ticks. We look for both SW and GPU frame ticks so that // the test can verify that only one or the other are found. analyzer.reset(TraceAnalyzer::Create(json_events)); - Query query_sw = Query(EVENT_NAME) == Query::String("TestFrameTickSW"); - Query query_gpu = Query(EVENT_NAME) == Query::String("TestFrameTickGPU"); + Query query_sw = Query::EventName() == Query::String("TestFrameTickSW"); + Query query_gpu = Query::EventName() == Query::String("TestFrameTickGPU"); analyzer->FindEvents(query_sw, &events_sw); analyzer->FindEvents(query_gpu, &events_gpu); TraceEventVector* frames = NULL; @@ -139,7 +141,7 @@ class ThroughputTest : public BrowserPerfTest { // Cull a few leading and trailing events as they might be unreliable. TraceEventVector rate_events(frames->begin() + kIgnoreSomeFrames, frames->end() - kIgnoreSomeFrames); - RateStats stats; + trace_analyzer::RateStats stats; ASSERT_TRUE(GetRateStats(rate_events, &stats)); printf("FPS = %f\n", 1000000.0 / stats.mean_us); |