Invalid sync token waits now automatically get released.

gpu/command_buffer/service/sync_point_manager_unittest.cc

 // Copyright (c) 2015 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 <stdint.h>
 
 #include <memory>
 #include <queue>
 
 #include "base/bind.h"
@@ skipping 363 matching lines @@
   wait_stream.BeginProcessing();
   ASSERT_EQ(3u, wait_stream.order_data->current_order_num());
   int test_num = 10;
   const bool valid_wait = wait_stream.client->Wait(
       release_stream.client->client_state().get(), 1,
       base::Bind(&SyncPointManagerTest::SetIntegerFunction, &test_num, 123));
   EXPECT_TRUE(valid_wait);
   EXPECT_EQ(10, test_num);
 
   // Even though release stream order [1] did not have a release, it
-  // should still release the fence when finish processing since the wait
-  // stream had expected on to exist there.
+  // should have changed test_num although the fence sync is still not released.
   release_stream.BeginProcessing();
   ASSERT_EQ(1u, release_stream.order_data->current_order_num());
   release_stream.EndProcessing();
-  EXPECT_TRUE(release_stream.client->client_state()->IsFenceSyncReleased(1));
+  EXPECT_FALSE(release_stream.client->client_state()->IsFenceSyncReleased(1));
   EXPECT_EQ(123, test_num);
+
+  // Ensure that the wait callback does not get triggered again when it is
+  // actually released.
+  test_num = 1;
+  release_stream.AllocateOrderNum(sync_point_manager_.get());
+  release_stream.BeginProcessing();
+  release_stream.client->ReleaseFenceSync(1);
+  release_stream.EndProcessing();
+  EXPECT_EQ(1, test_num);
 }
 
 TEST_F(SyncPointManagerTest, NonExistentOrderNumRelease) {
   const CommandBufferNamespace kNamespaceId =
       gpu::CommandBufferNamespace::GPU_IO;
   const CommandBufferId kBufferId1 = CommandBufferId::FromUnsafeValue(0x123);
   const CommandBufferId kBufferId2 = CommandBufferId::FromUnsafeValue(0x234);
 
   SyncPointStream release_stream(sync_point_manager_.get(), kNamespaceId,
                                  kBufferId1);
@@ skipping 25 matching lines @@
   EXPECT_EQ(10, test_num);
 
   // Release stream should know it should release fence sync by order [3],
   // so going through order [1] should not release it yet.
   release_stream.BeginProcessing();
   ASSERT_EQ(1u, release_stream.order_data->current_order_num());
   release_stream.EndProcessing();
   EXPECT_FALSE(release_stream.client->client_state()->IsFenceSyncReleased(1));
   EXPECT_EQ(10, test_num);
 
-  // Beginning order [4] should immediately trigger the release.
+  // Beginning order [4] should immediately trigger the wait although the fence
+  // sync is still not released yet.
   release_stream.BeginProcessing();
   ASSERT_EQ(4u, release_stream.order_data->current_order_num());
-  EXPECT_TRUE(release_stream.client->client_state()->IsFenceSyncReleased(1));
+  EXPECT_FALSE(release_stream.client->client_state()->IsFenceSyncReleased(1));
   EXPECT_EQ(123, test_num);
+
+  // Ensure that the wait callback does not get triggered again when it is
+  // actually released.
+  test_num = 1;
+  release_stream.client->ReleaseFenceSync(1);
+  EXPECT_EQ(1, test_num);
 }
 
 TEST_F(SyncPointManagerTest, OnWaitCallbackTest) {
   const CommandBufferNamespace kNamespaceId =
       gpu::CommandBufferNamespace::GPU_IO;
   const CommandBufferId kBufferId1 = CommandBufferId::FromUnsafeValue(0x123);
   const CommandBufferId kBufferId2 = CommandBufferId::FromUnsafeValue(0x234);
 
   SyncPointStream release_stream(sync_point_manager_.get(), kNamespaceId,
                                  kBufferId1);
@@ skipping 34 matching lines @@
   EXPECT_TRUE(valid_wait);
   EXPECT_EQ(10, test_num);
   EXPECT_EQ(kNamespaceId, namespace_id);
   EXPECT_EQ(kBufferId2, client_id);
 
   release_stream.client->ReleaseFenceSync(2);
   EXPECT_EQ(123, test_num);
 }
 
 }  // namespace gpu