From 843f993fc950c0324e303bbd1d03d2bf8c3b2624 Mon Sep 17 00:00:00 2001
From: Vincent Liu <5900509+onecent1101@users.noreply.github.com>
Date: Mon, 11 Oct 2021 13:17:07 -0700
Subject: [PATCH] Improve ticket tracker workflow for testing (#4610)

* Improve ticket tracker workflow for testing

Signed-off-by: onecent1101 <liug@amazon.com>
---
 .../AWSGameLiftClientLocalTicketTracker.cpp      | 16 +++++++++++++---
 .../Source/AWSGameLiftClientLocalTicketTracker.h |  2 ++
 .../AWSGameLiftClientLocalTicketTrackerTest.cpp  |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
index 9ae168aea9..b619a10d4a 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.cpp
@@ -47,6 +47,15 @@ namespace AWSGameLift
             AZ_TracePrintf(AWSGameLiftClientLocalTicketTrackerName, "Matchmaking ticket tracker is running.");
             return;
         }
+
+        // Make sure thread and wait event are both in clean state before starting new one
+        m_waitEvent.release();
+        if (m_trackerThread.joinable())
+        {
+            m_trackerThread.join();
+        }
+        m_waitEvent.acquire();
+
         m_status = TicketTrackerStatus::Running;
         m_trackerThread = AZStd::thread(AZStd::bind(
             &AWSGameLiftClientLocalTicketTracker::ProcessPolling, this, ticketId, playerId));
@@ -56,6 +65,7 @@ namespace AWSGameLift
     {
         AZStd::lock_guard<AZStd::mutex> lock(m_trackerMutex);
         m_status = TicketTrackerStatus::Idle;
+        m_waitEvent.release();
         if (m_trackerThread.joinable())
         {
             m_trackerThread.join();
@@ -81,19 +91,19 @@ namespace AWSGameLift
                         auto ticket = describeMatchmakingOutcome.GetResult().GetTicketList().front();
                         if (ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::COMPLETED)
                         {
-                            m_status = TicketTrackerStatus::Idle;
                             AZ_TracePrintf(AWSGameLiftClientLocalTicketTrackerName,
                                 "Matchmaking ticket %s is complete.", ticket.GetTicketId().c_str());
                             RequestPlayerJoinMatch(ticket, playerId);
+                            m_status = TicketTrackerStatus::Idle;
                             return;
                         }
                         else if (ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::TIMED_OUT ||
                             ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::FAILED ||
                             ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::CANCELLED)
                         {
-                            m_status = TicketTrackerStatus::Idle;
                             AZ_Error(AWSGameLiftClientLocalTicketTrackerName, false, "Matchmaking ticket %s is not complete, %s",
                                 ticket.GetTicketId().c_str(), ticket.GetStatusReason().c_str());
+                            m_status = TicketTrackerStatus::Idle;
                             return;
                         }
                         else if (ticket.GetStatus() == Aws::GameLift::Model::MatchmakingConfigurationStatus::REQUIRES_ACCEPTANCE)
@@ -122,7 +132,7 @@ namespace AWSGameLift
             {
                 AZ_Error(AWSGameLiftClientLocalTicketTrackerName, false, AWSGameLiftClientMissingErrorMessage);
             }
-            AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(m_pollingPeriodInMS));
+            m_waitEvent.try_acquire_for(AZStd::chrono::milliseconds(m_pollingPeriodInMS));
         }
     }
 
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.h b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.h
index 7b317a0485..23083e9fd9 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.h
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Source/AWSGameLiftClientLocalTicketTracker.h
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <AzCore/std/parallel/binary_semaphore.h>
 #include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/thread.h>
 
@@ -58,5 +59,6 @@ namespace AWSGameLift
 
         AZStd::mutex m_trackerMutex;
         AZStd::thread m_trackerThread;
+        AZStd::binary_semaphore m_waitEvent;
     };
 } // namespace AWSGameLift
diff --git a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
index 6e688b28e3..6506d70704 100644
--- a/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
+++ b/Gems/AWSGameLift/Code/AWSGameLiftClient/Tests/AWSGameLiftClientLocalTicketTrackerTest.cpp
@@ -16,7 +16,7 @@
 
 using namespace AWSGameLift;
 
-static constexpr const uint64_t TEST_RACKER_POLLING_PERIOD_MS = 100;
+static constexpr const uint64_t TEST_RACKER_POLLING_PERIOD_MS = 1000;
 static constexpr const uint64_t TEST_WAIT_BUFFER_TIME_MS = 10;
 static constexpr const uint64_t TEST_WAIT_MAXIMUM_TIME_MS = 10000;