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));
+  explicit GPUTracerTester(gles2::GLES2Decoder* decoder, GPUTiming* gpu_timing)

[Daniele Castagna, 2015/02/19 18:15:32]

nit: explicit here is not needed anymore.

+      : GPUTracer(decoder, gpu_timing), tracing_enabled_(0) {
+    gpu_timing_->SetCpuTimeForTesting(base::Bind(&FakeCpuTime));
 
     // 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 233 matching lines @@
 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;
   }
 
@@ skipping 10 matching lines @@
     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 64 matching lines @@
     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.
+    scoped_refptr<DisjointContext> disjoint_context =
+        gpu_timing_.CreateDisjointContext();
+
+    ASSERT_FALSE(disjoint_context->CheckAndResetTimerErrors());
     gl_fake_queries_.SetDisjoint();
+    ASSERT_TRUE(disjoint_context->CheckAndResetTimerErrors());
 
     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 44 matching lines @@
 
 class GPUTracerTest : public GpuServiceTest {
  protected:
   void SetUp() override {
     g_fakeCPUTime = 0;
     GpuServiceTest::SetUpWithGLVersion("3.2", "");
     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));
+
+  scoped_refptr<DisjointContext> disjoint_context1 =
+        gpu_timing_.CreateDisjointContext();
+  scoped_refptr<DisjointContext> disjoint_context2 =
+        gpu_timing_.CreateDisjointContext();
+
+  // Test both contexts are initialized as no errors.
+  ASSERT_FALSE(disjoint_context1->CheckAndResetTimerErrors());
+  ASSERT_FALSE(disjoint_context2->CheckAndResetTimerErrors());
+
+  // Issue a disjoint.
+  gl_fake_queries_.SetDisjoint();
+
+  ASSERT_TRUE(disjoint_context1->CheckAndResetTimerErrors());
+  ASSERT_TRUE(disjoint_context2->CheckAndResetTimerErrors());
+
+  // Test new context gets the disjoint value as if no other contexts reset it.
+  scoped_refptr<DisjointContext> disjoint_context3 =
+        gpu_timing_.CreateDisjointContext();
+  ASSERT_TRUE(disjoint_context3->CheckAndResetTimerErrors());
+
+  // Test all 3 are all reset.
+  ASSERT_FALSE(disjoint_context1->CheckAndResetTimerErrors());
+  ASSERT_FALSE(disjoint_context2->CheckAndResetTimerErrors());
+  ASSERT_FALSE(disjoint_context3->CheckAndResetTimerErrors());
+}
+
+TEST_F(GpuDisjointTimerTracerTest, DisjointContextDestruction) {
+  ASSERT_EQ(0u, gpu_timing_.GetDisjointContextsCount());
+
+  {
+    scoped_refptr<DisjointContext> context =
+        gpu_timing_.CreateDisjointContext();
+    ASSERT_EQ(1u, gpu_timing_.GetDisjointContextsCount());
+  }
+
+  ASSERT_EQ(0u, gpu_timing_.GetDisjointContextsCount());
+}
+
 }  // namespace
 }  // namespace gles2
 }  // namespace gpu