Added disjoint context class which manages disjoints within gpu timing.

gpu/command_buffer/service/gpu_tracer_unittest.cc

 // Copyright 2014 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 <map>
 #include <set>
 
 #include "base/bind.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 132 matching lines @@
  protected:
   bool disjointed_ = false;
   GLint64 current_time_ = 0;
   GLuint next_query_id_ = 0;
   std::set<GLuint> alloced_queries_;
   std::map<GLuint, GLint64> query_timestamp_;
 };
 
 class GPUTracerTester : public GPUTracer {
  public:
-  explicit GPUTracerTester(gles2::GLES2Decoder* decoder)
-      : GPUTracer(decoder), tracing_enabled_(0) {
-    gpu_timing_.SetCpuTimeForTesting(base::Bind(&FakeCpuTime));
-
+  GPUTracerTester(gles2::GLES2Decoder* decoder, GPUTiming* gpu_timing)
+      : GPUTracer(decoder, gpu_timing), tracing_enabled_(0) {
     // Force tracing to be dependent on our mock variable here.
     gpu_trace_srv_category = &tracing_enabled_;
     gpu_trace_dev_category = &tracing_enabled_;
   }
 
   ~GPUTracerTester() override {}
 
   void SetTracingEnabled(bool enabled) {
     tracing_enabled_ = enabled ? 1 : 0;
   }
@@ skipping 17 matching lines @@
 
   unsigned char tracing_enabled_;
 
   scoped_refptr<Outputter> set_outputter_;
 };
 
 class BaseGpuTest : public GpuServiceTest {
  public:
   explicit BaseGpuTest(GPUTiming::TimerType test_timer_type)
       : test_timer_type_(test_timer_type) {
-    gpu_timing_.SetCpuTimeForTesting(base::Bind(&FakeCpuTime));
-    gpu_timing_.SetTimerTypeForTesting(test_timer_type);
   }
 
  protected:
   void SetUp() override {
     g_fakeCPUTime = 0;
     const char* gl_version = "3.2";
     const char* extensions = "";
     if (GetTimerType() == GPUTiming::kTimerTypeDisjoint) {
       gl_version = "opengl es 3.0";
       extensions = "GL_EXT_disjoint_timer_query";
     } else if (GetTimerType() == GPUTiming::kTimerTypeARB) {
       // TODO(sievers): The tracer should not depend on ARB_occlusion_query.
       // Try merge Query APIs (core, ARB, EXT) into a single binding each.
       extensions = "GL_ARB_timer_query GL_ARB_occlusion_query";
     }
     GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
+    gpu_timing_.Initialize(GetGLContext());
+    gpu_timing_.SetCpuTimeForTesting(base::Bind(&FakeCpuTime));
     gl_fake_queries_.Reset();
 
     outputter_ref_ = new MockOutputter();
   }
 
   void TearDown() override {
     outputter_ref_ = NULL;
 
     gl_fake_queries_.Reset();
     GpuServiceTest::TearDown();
   }
 
   void ExpectTraceQueryMocks() {
     if (GetTimerType() != GPUTiming::kTimerTypeInvalid) {
       // Delegate query APIs used by GPUTrace to a GlFakeQueries
       EXPECT_CALL(*gl_, GenQueriesARB(2, NotNull())).Times(AtLeast(1))
           .WillRepeatedly(
               Invoke(&gl_fake_queries_, &GlFakeQueries::GenQueriesARB));
 
       EXPECT_CALL(*gl_, GetQueryObjectivARB(_, GL_QUERY_RESULT_AVAILABLE,
-                                         NotNull()))
+                                            NotNull()))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::GetQueryObjectivARB));
 
-      if (GetTimerType() == GPUTiming::kTimerTypeDisjoint) {
-        EXPECT_CALL(*gl_, GetInteger64v(GL_TIMESTAMP, _))
+      EXPECT_CALL(*gl_, GetInteger64v(GL_TIMESTAMP, _))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::GetInteger64v));
-      }
 
       EXPECT_CALL(*gl_, QueryCounter(_, GL_TIMESTAMP)).Times(AtLeast(2))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::QueryCounter));
 
       EXPECT_CALL(*gl_, GetQueryObjectui64v(_, GL_QUERY_RESULT, NotNull()))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_,
                       &GlFakeQueries::GetQueryObjectui64v));
 
@@ skipping 89 matching lines @@
     const int64 expect_end_time =
         (end_timestamp / base::Time::kNanosecondsPerMicrosecond) + offset_time;
 
     ExpectTraceQueryMocks();
     ExpectOutputterMocks(outputter_ref_.get(), category_name, trace_name,
                          expect_start_time, expect_end_time);
 
     scoped_refptr<GPUTrace> trace = new GPUTrace(
         outputter_ref_, &gpu_timing_, category_name, trace_name, true);
 
-    gpu_timing_.SetOffsetForTesting(
-        offset_time, test_timer_type_ == GPUTiming::kTimerTypeARB);
-
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
     g_fakeCPUTime = expect_start_time;
     trace->Start(true);
 
     // Shouldn't be available before End() call
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     g_fakeCPUTime = expect_end_time;
     EXPECT_FALSE(trace->IsAvailable());
 
     trace->End(true);
@@ skipping 36 matching lines @@
 // Test GPUTracer calls all the correct gl calls.
 class BaseGpuTracerTest : public BaseGpuTest {
  public:
   explicit BaseGpuTracerTest(GPUTiming::TimerType test_timer_type)
       : BaseGpuTest(test_timer_type) {}
 
   void DoBasicTracerTest() {
     ExpectTracerOffsetQueryMocks();
 
     MockGLES2Decoder decoder;
-    EXPECT_CALL(decoder, GetGLContext()).WillOnce(Return(GetGLContext()));
-    GPUTracerTester tracer(&decoder);
+    GPUTracerTester tracer(&decoder, &gpu_timing_);
     tracer.SetTracingEnabled(true);
 
     tracer.SetOutputter(outputter_ref_);
 
     ASSERT_TRUE(tracer.BeginDecoding());
     ASSERT_TRUE(tracer.EndDecoding());
 
     outputter_ref_ = NULL;
   }
 
   void DoTracerMarkersTest() {
     ExpectTracerOffsetQueryMocks();
 
     EXPECT_CALL(*gl_, GetError()).Times(AtLeast(0))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::GetError));
 
     const std::string category_name("trace_category");
     const std::string trace_name("trace_test");
     const int64 offset_time = 3231;
     const GLint64 start_timestamp = 7 * base::Time::kNanosecondsPerMicrosecond;
     const GLint64 end_timestamp = 32 * base::Time::kNanosecondsPerMicrosecond;
     const int64 expect_start_time =
         (start_timestamp / base::Time::kNanosecondsPerMicrosecond) +
         offset_time;
     const int64 expect_end_time =
         (end_timestamp / base::Time::kNanosecondsPerMicrosecond) + offset_time;
 
     MockGLES2Decoder decoder;
-    EXPECT_CALL(decoder, GetGLContext()).WillOnce(Return(GetGLContext()));
-    GPUTracerTester tracer(&decoder);
+    GPUTracerTester tracer(&decoder, &gpu_timing_);
     tracer.SetTracingEnabled(true);
 
     tracer.SetOutputter(outputter_ref_);
 
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
     g_fakeCPUTime = expect_start_time;
 
     ASSERT_TRUE(tracer.BeginDecoding());
 
     ExpectTraceQueryMocks();
@@ skipping 63 matching lines @@
     const int64 offset_time = 3231;
     const GLint64 start_timestamp = 7 * base::Time::kNanosecondsPerMicrosecond;
     const GLint64 end_timestamp = 32 * base::Time::kNanosecondsPerMicrosecond;
     const int64 expect_start_time =
         (start_timestamp / base::Time::kNanosecondsPerMicrosecond) +
         offset_time;
     const int64 expect_end_time =
         (end_timestamp / base::Time::kNanosecondsPerMicrosecond) + offset_time;
 
     MockGLES2Decoder decoder;
-    EXPECT_CALL(decoder, GetGLContext()).WillOnce(Return(GetGLContext()));
-    GPUTracerTester tracer(&decoder);
+    GPUTracerTester tracer(&decoder, &gpu_timing_);
     tracer.SetTracingEnabled(true);
 
     tracer.SetOutputter(outputter_ref_);
 
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
     g_fakeCPUTime = expect_start_time;
 
     ASSERT_TRUE(tracer.BeginDecoding());
 
     ExpectTraceQueryMocks();
 
     ExpectOutputterBeginMocks(outputter_ref_.get(),
                               category_name, trace_name);
     ASSERT_TRUE(tracer.Begin(category_name, trace_name, source));
 
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     g_fakeCPUTime = expect_end_time;
+
+    // Create a disjoint context to test disjoint behavior. This should not
+    // interfere with the tracer's disjoint context.
+    int disjoint_id = gpu_timing_.CreateDisjointContextID();
+
+    ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id));
     gl_fake_queries_.SetDisjoint();
+    ASSERT_TRUE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id));
 
     ExpectOutputterEndMocks(outputter_ref_.get(), category_name, trace_name,
                             expect_start_time, expect_end_time, false);
 
     ASSERT_TRUE(tracer.End(source));
     ASSERT_TRUE(tracer.EndDecoding());
 
     outputter_ref_ = NULL;
   }
 };
@@ skipping 40 matching lines @@
 
 TEST_F(GpuDisjointTimerTracerTest, DisjointTimerDisjointTraceTest) {
   DoDisjointTest();
 }
 
 class GPUTracerTest : public GpuServiceTest {
  protected:
   void SetUp() override {
     g_fakeCPUTime = 0;
     GpuServiceTest::SetUpWithGLVersion("3.2", "");
+    gpu_timing_.Initialize(GetGLContext());
+    gpu_timing_.SetCpuTimeForTesting(base::Bind(&FakeCpuTime));
     decoder_.reset(new MockGLES2Decoder());
-    EXPECT_CALL(*decoder_, GetGLContext())
-        .Times(AtMost(1))
-        .WillRepeatedly(Return(GetGLContext()));
-    tracer_tester_.reset(new GPUTracerTester(decoder_.get()));
+    tracer_tester_.reset(new GPUTracerTester(decoder_.get(), &gpu_timing_));
   }
 
   void TearDown() override {
     tracer_tester_ = nullptr;
     decoder_ = nullptr;
     GpuServiceTest::TearDown();
   }
+  GPUTiming gpu_timing_;
   scoped_ptr<MockGLES2Decoder> decoder_;
   scoped_ptr<GPUTracerTester> tracer_tester_;
 };
 
 TEST_F(GPUTracerTest, IsTracingTest) {
   EXPECT_FALSE(tracer_tester_->IsTracing());
   tracer_tester_->SetTracingEnabled(true);
   EXPECT_TRUE(tracer_tester_->IsTracing());
 }
 // Test basic functionality of the GPUTracerTester.
@@ skipping 10 matching lines @@
 
   EXPECT_FALSE(
       tracer_tester_->Begin(category_name, trace_name, kTraceGroupMarker));
 
   ASSERT_TRUE(tracer_tester_->BeginDecoding());
   EXPECT_TRUE(
       tracer_tester_->Begin(category_name, trace_name, kTraceGroupMarker));
   ASSERT_TRUE(tracer_tester_->EndDecoding());
 }
 
+TEST_F(GpuDisjointTimerTracerTest, MultipleDisjointContexts) {
+  EXPECT_CALL(*gl_, GetIntegerv(GL_GPU_DISJOINT_EXT, _)).Times(AtLeast(1))
+          .WillRepeatedly(
+              Invoke(&gl_fake_queries_, &GlFakeQueries::GetIntegerv));
+
+  int disjoint_id1 = gpu_timing_.CreateDisjointContextID();
+  int disjoint_id2 = gpu_timing_.CreateDisjointContextID();
+
+  // Test both contexts are initialized as no errors.
+  ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id1));
+  ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id2));
+
+  // Issue a disjoint.
+  gl_fake_queries_.SetDisjoint();
+
+  ASSERT_TRUE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id1));
+  ASSERT_TRUE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id2));
+
+  // Test new context gets the disjoint value as if no other contexts reset it.
+  int disjoint_id3 = gpu_timing_.CreateDisjointContextID();
+  ASSERT_TRUE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id3));
+
+  // Test all 3 are all reset.
+  ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id1));
+  ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id2));
+  ASSERT_FALSE(gpu_timing_.CheckAndResetTimerErrors(disjoint_id3));
+}
+
 }  // namespace
 }  // namespace gles2
 }  // namespace gpu