Fix crash.

Author: Mysticial

Common/Cpp/Concurrency/AsyncTask.cpp

@@ -38,6 +38,9 @@ AsyncTask::~AsyncTask(){
 
 
 void AsyncTask::report_cancelled() noexcept{
+#ifdef PA_SANITIZE_AsyncTask
+    auto scope = m_sanitizer.check_scope();
+#endif
     m_state.store(State::FINISHED, std::memory_order_release);
     {
         std::lock_guard<std::mutex> lg(m_lock);
@@ -46,6 +49,9 @@ void AsyncTask::report_cancelled() noexcept{
     m_state.store(State::SAFE_TO_DESTRUCT, std::memory_order_release);
 }
 void AsyncTask::run() noexcept{
+#ifdef PA_SANITIZE_AsyncTask
+    auto scope = m_sanitizer.check_scope();
+#endif
     try{
         m_task();
     }catch (...){

Common/Cpp/Concurrency/AsyncTask.h

@@ -13,6 +13,12 @@
 #include <mutex>
 #include <condition_variable>
 
+#define PA_SANITIZE_AsyncTask
+
+#ifdef PA_SANITIZE_AsyncTask
+#include "Common/Cpp/LifetimeSanitizer.h"
+#endif
+
 namespace PokemonAutomation{
 
 
@@ -40,12 +46,18 @@ class AsyncTask{
     {}
 
     bool is_finished() const noexcept{
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
         State state = m_state.load(std::memory_order_acquire);
         return state == State::FINISHED || state == State::SAFE_TO_DESTRUCT;
     }
 
     //  Wait for the task to finish. Will rethrow any exceptions.
     void wait_and_rethrow_exceptions(){
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
         if (!is_finished()){
             std::unique_lock<std::mutex> lg(m_lock);
             m_cv.wait(lg, [this]{ return is_finished(); });
@@ -60,6 +72,9 @@ class AsyncTask{
     //  These should only be called inside a parallel framework.
     //  These are not thread-safe with each other.
     void report_started(){
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
         m_state.store(State::RUNNING, std::memory_order_release);
     }
     void report_cancelled() noexcept;
@@ -72,6 +87,10 @@ class AsyncTask{
     std::exception_ptr m_exception;
     mutable std::mutex m_lock;
     std::condition_variable m_cv;
+
+#ifdef PA_SANITIZE_AsyncTask
+    LifetimeSanitizer m_sanitizer;
+#endif
 };
 
 

Common/Cpp/LifetimeSanitizer.cpp

@@ -105,14 +105,14 @@ void LifetimeSanitizer::check_usage() const{
         return;
     }
     ReadSpinLock lg(sanitizer_lock);
-    if (SANITIZER_FILTER.contains(m_name)){
-        std::cout << "LifetimeSanitizer - Using: " << this << " : " << m_name << std::endl;
-    }
     auto iter = sanitizer_map.find(this);
     if (iter == sanitizer_map.end()){
-        std::cerr << "Use non-existent: " << this << " : " << m_name << std::endl;
+        std::cerr << "Use non-existent: " << this << std::endl;
         terminate_with_dump();
     }
+    if (SANITIZER_FILTER.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Using: " << this << " : " << m_name << std::endl;
+    }
     if (m_token != SANITIZER_TOKEN || m_self != this){
         std::cerr << "Use corrupted: " << this << " : " << m_name << std::endl;
         terminate_with_dump();
@@ -123,14 +123,14 @@ void LifetimeSanitizer::start_using() const{
         return;
     }
     ReadSpinLock lg(sanitizer_lock);
-    if (SANITIZER_FILTER.contains(m_name)){
-        std::cout << "LifetimeSanitizer - Start using: " << this << " : " << m_name << std::endl;
-    }
     auto iter = sanitizer_map.find(this);
     if (iter == sanitizer_map.end()){
-        std::cerr << "Start using non-existent: " << this << " : " << m_name << std::endl;
+        std::cerr << "Start using non-existent: " << this << std::endl;
         terminate_with_dump();
     }
+    if (SANITIZER_FILTER.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Start using: " << this << " : " << m_name << std::endl;
+    }
     if (m_token != SANITIZER_TOKEN || m_self != this){
         std::cerr << "Start using corrupted: " << this << " : " << m_name << std::endl;
         terminate_with_dump();
@@ -142,14 +142,14 @@ void LifetimeSanitizer::done_using() const{
         return;
     }
     ReadSpinLock lg(sanitizer_lock);
-    if (SANITIZER_FILTER.contains(m_name)){
-        std::cout << "LifetimeSanitizer - Done using: " << this << " : " << m_name << std::endl;
-    }
     auto iter = sanitizer_map.find(this);
     if (iter == sanitizer_map.end()){
-        std::cerr << "Done using non-existent: " << this << " : " << m_name << std::endl;
+        std::cerr << "Done using non-existent: " << this << std::endl;
         terminate_with_dump();
     }
+    if (SANITIZER_FILTER.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Done using: " << this << " : " << m_name << std::endl;
+    }
     if (m_token != SANITIZER_TOKEN || m_self != this){
         std::cerr << "Done using corrupted: " << this << " : " << m_name << std::endl;
         terminate_with_dump();

SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp

@@ -65,6 +65,14 @@ void SnapshotManager::convert(uint64_t seqnum, QVideoFrame frame, WallClock time
 
     m_active_conversions--;
     m_cv.notify_all();
+
+    if (m_queued_convert){
+        m_queued_convert = false;
+        seqnum = m_cache.get_latest(frame, timestamp);
+        if (m_converting_seqnum < seqnum){
+            dispatch_conversion(seqnum, std::move(frame), timestamp);
+        }
+    }
 }
 bool SnapshotManager::try_dispatch_conversion(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept{
     //  Must call under the lock.
@@ -84,17 +92,6 @@ bool SnapshotManager::try_dispatch_conversion(uint64_t seqnum, QVideoFrame frame
     try{
         std::function<void()> lambda = [=, this, frame = std::move(frame)](){
             convert(seqnum, std::move(frame), timestamp);
-
-            std::lock_guard<std::mutex> lg(m_lock);
-            if (m_queued_convert){
-                m_queued_convert = false;
-                QVideoFrame frame;
-                WallClock timestamp;
-                uint64_t seqnum = m_cache.get_latest(frame, timestamp);
-                if (m_converting_seqnum < seqnum){
-                    dispatch_conversion(seqnum, std::move(frame), timestamp);
-                }
-            }
         };
 
         *task = GlobalThreadPools::realtime_inference().try_dispatch(lambda);
@@ -106,9 +103,9 @@ bool SnapshotManager::try_dispatch_conversion(uint64_t seqnum, QVideoFrame frame
 
         //  Dispatch failed. Queue it for later.
         m_queued_convert = true;
-    }catch (...){
-        m_pending_conversions.erase(seqnum);
-    }
+    }catch (...){}
+
+    m_pending_conversions.erase(seqnum);
 
     return false;
 }