birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaces handlers of TraceMessageDrillerBus with handlers of TraceMessageBus

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-02 09:57:33 -08:00
parent 668d1bba1e
commit 1b01ec18b0
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/Tests/Debug.cpp
+5 -4
View File
@@ -7,7 +7,7 @@
*/
#include <AzCore/Debug/StackTracer.h>
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/std/parallel/thread.h>
#include <AzCore/Math/Crc.h>
@@ -104,7 +104,7 @@ namespace UnitTest
}
class TraceTest
: public AZ::Debug::TraceMessageDrillerBus::Handler
: public AZ::Debug::TraceMessageBus::Handler
, public ::testing::Test
{
int m_numTracePrintfs;
@@ -113,12 +113,13 @@ namespace UnitTest
: m_numTracePrintfs(0) {}
//////////////////////////////////////////////////////////////////////////
// TraceMessagesDrillerBus
void OnPrintf(const char* windowName, const char* message) override
// TraceMessageBus
bool OnPrintf(const char* windowName, const char* message) override
{
(void)windowName;
(void)message;
++m_numTracePrintfs;
return false;
}
//////////////////////////////////////////////////////////////////////////
Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
+9 -8
View File
@@ -13,7 +13,7 @@
#include <AzCore/std/string/string.h>
#include <AzCore/std/parallel/thread.h>
#include <AzCore/std/parallel/shared_spin_mutex.h>
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/Statistics/StatisticalProfilerProxy.h>
@@ -468,28 +468,29 @@ namespace UnitTest
/** Trace message handler to track messages during tests
*/
struct MyTraceMessageSink final
: public AZ::Debug::TraceMessageDrillerBus::Handler
: public AZ::Debug::TraceMessageBus::Handler
{
MyTraceMessageSink()
{
AZ::Debug::TraceMessageDrillerBus::Handler::BusConnect();
AZ::Debug::TraceMessageBus::Handler::BusConnect();
}
~MyTraceMessageSink()
{
AZ::Debug::TraceMessageDrillerBus::Handler::BusDisconnect();
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
}
//////////////////////////////////////////////////////////////////////////
// TraceMessageDrillerBus
void OnPrintf(const char* window, const char* message) override
// TraceMessageBus
bool OnPrintf(const char* window, const char* message) override
{
OnOutput(window, message);
return OnOutput(window, message);
}
void OnOutput(const char* window, const char* message) override
bool OnOutput(const char* window, const char* message) override
{
printf("%s: %s\n", window, message);
return false;
}
}; //struct MyTraceMessageSink
Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
+9 -8
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzToolsFramework/API/EditorPythonConsoleBus.h>
namespace UnitTest
@@ -15,18 +15,18 @@ namespace UnitTest
/** Trace message handler to track messages during tests
*/
struct PythonTraceMessageSink final
: public AZ::Debug::TraceMessageDrillerBus::Handler
: public AZ::Debug::TraceMessageBus::Handler
, public AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
{
PythonTraceMessageSink()
{
AZ::Debug::TraceMessageDrillerBus::Handler::BusConnect();
AZ::Debug::TraceMessageBus::Handler::BusConnect();
AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
}
~PythonTraceMessageSink()
{
AZ::Debug::TraceMessageDrillerBus::Handler::BusDisconnect();
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
}
@@ -47,13 +47,13 @@ namespace UnitTest
}
//////////////////////////////////////////////////////////////////////////
// TraceMessageDrillerBus
void OnPrintf(const char* window, const char* message) override
// TraceMessageBus
bool OnPrintf(const char* window, const char* message) override
{
OnOutput(window, message);
return OnOutput(window, message);
}
void OnOutput(const char* window, const char* message) override
bool OnOutput(const char* window, const char* message) override
{
AZStd::lock_guard<decltype(m_lock)> lock(m_lock);
@@ -73,6 +73,7 @@ namespace UnitTest
}
}
}
return false;
}
//////////////////////////////////////////////////////////////////////////