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

Removes TraceMessageDrillerBus

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-12-02 10:08:58 -08:00
parent 1b01ec18b0
commit 8bde44d5fb
7 changed files with 0 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
-1
View File
@@ -49,7 +49,6 @@
#include <AzCore/IO/SystemFile.h>
#include <AzCore/Driller/Driller.h>
#include <AzCore/Debug/TraceMessagesDriller.h>
#include <AzCore/Debug/EventTraceDriller.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/Script/ScriptSystemBus.h>
Code/Framework/AzCore/AzCore/Debug/Trace.cpp
-13
View File
@@ -12,7 +12,6 @@
#include <AzCore/Debug/StackTracer.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
#include <AzCore/Debug/IEventLogger.h>
#include <AzCore/Interface/Interface.h>
@@ -276,8 +275,6 @@ namespace AZ::Debug
logger->Flush(); // Flush as an assert may indicate a crash is imminent.
}
EBUS_EVENT(TraceMessageDrillerBus, OnPreAssert, fileName, line, funcName, message);
TraceMessageResult result;
EBUS_EVENT_RESULT(result, TraceMessageBus, OnPreAssert, fileName, line, funcName, message);
@@ -302,7 +299,6 @@ namespace AZ::Debug
azstrcat(message, g_maxMessageLength, "\n");
Output(g_dbgSystemWnd, message);
EBUS_EVENT(TraceMessageDrillerBus, OnAssert, message);
EBUS_EVENT_RESULT(result, TraceMessageBus, OnAssert, message);
if (result.m_value)
{
@@ -405,8 +401,6 @@ namespace AZ::Debug
logger->RecordStringEvent(ErrorEventId, message);
}
EBUS_EVENT(TraceMessageDrillerBus, OnPreError, window, fileName, line, funcName, message);
TraceMessageResult result;
EBUS_EVENT_RESULT(result, TraceMessageBus, OnPreError, window, fileName, line, funcName, message);
if (result.m_value)
@@ -421,7 +415,6 @@ namespace AZ::Debug
azstrcat(message, g_maxMessageLength, "\n");
Output(window, message);
EBUS_EVENT(TraceMessageDrillerBus, OnError, window, message);
EBUS_EVENT_RESULT(result, TraceMessageBus, OnError, window, message);
Output(window, "==================================================================\n");
if (result.m_value)
@@ -457,8 +450,6 @@ namespace AZ::Debug
logger->RecordStringEvent(WarningEventId, message);
}
EBUS_EVENT(TraceMessageDrillerBus, OnPreWarning, window, fileName, line, funcName, message);
TraceMessageResult result;
EBUS_EVENT_RESULT(result, TraceMessageBus, OnPreWarning, window, fileName, line, funcName, message);
if (result.m_value)
@@ -472,7 +463,6 @@ namespace AZ::Debug
azstrcat(message, g_maxMessageLength, "\n");
Output(window, message);
EBUS_EVENT(TraceMessageDrillerBus, OnWarning, window, message);
EBUS_EVENT_RESULT(result, TraceMessageBus, OnWarning, window, message);
Output(window, "==================================================================\n");
}
@@ -501,8 +491,6 @@ namespace AZ::Debug
logger->RecordStringEvent(PrintfEventId, message);
}
EBUS_EVENT(TraceMessageDrillerBus, OnPrintf, window, message);
TraceMessageResult result;
EBUS_EVENT_RESULT(result, TraceMessageBus, OnPrintf, window, message);
if (result.m_value)
@@ -531,7 +519,6 @@ namespace AZ::Debug
// only call into Ebusses if we are not in a recursive-exception situation as that
// would likely just lead to even more exceptions.
EBUS_EVENT(TraceMessageDrillerBus, OnOutput, window, message);
TraceMessageResult result;
EBUS_EVENT_RESULT(result, TraceMessageBus, OnOutput, window, message);
if (result.m_value)
Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.cpp
-99
View File
@@ -1,99 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <AzCore/Debug/TraceMessagesDriller.h>
#include <AzCore/Math/Crc.h>
namespace AZ::Debug
{
//=========================================================================
// Start
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::Start(const Param* params, int numParams)
{
(void)params;
(void)numParams;
BusConnect();
}
//=========================================================================
// Stop
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::Stop()
{
BusDisconnect();
}
//=========================================================================
// OnAssert
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::OnAssert(const char* message)
{
// Not sure if we can really capture assert since the code will stop executing very soon.
m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
m_output->Write(AZ_CRC_CE("OnAssert"), message);
m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
}
//=========================================================================
// OnException
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::OnException(const char* message)
{
// Not sure if we can really capture exception since the code will stop executing very soon.
m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
m_output->Write(AZ_CRC_CE("OnException"), message);
m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
}
//=========================================================================
// OnError
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::OnError(const char* window, const char* message)
{
m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
m_output->BeginTag(AZ_CRC_CE("OnError"));
m_output->Write(AZ_CRC_CE("Window"), window);
m_output->Write(AZ_CRC_CE("Message"), message);
m_output->EndTag(AZ_CRC_CE("OnError"));
m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
}
//=========================================================================
// OnWarning
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::OnWarning(const char* window, const char* message)
{
m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
m_output->BeginTag(AZ_CRC_CE("OnWarning"));
m_output->Write(AZ_CRC_CE("Window"), window);
m_output->Write(AZ_CRC_CE("Message"), message);
m_output->EndTag(AZ_CRC_CE("OnWarning"));
m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
}
//=========================================================================
// OnPrintf
// [2/6/2013]
//=========================================================================
void TraceMessagesDriller::OnPrintf(const char* window, const char* message)
{
m_output->BeginTag(AZ_CRC_CE("TraceMessagesDriller"));
m_output->BeginTag(AZ_CRC_CE("OnPrintf"));
m_output->Write(AZ_CRC_CE("Window"), window);
m_output->Write(AZ_CRC_CE("Message"), message);
m_output->EndTag(AZ_CRC_CE("OnPrintf"));
m_output->EndTag(AZ_CRC_CE("TraceMessagesDriller"));
}
} // namespace AZ
Code/Framework/AzCore/AzCore/Debug/TraceMessagesDriller.h
-49
View File
@@ -1,49 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Driller/Driller.h>
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
namespace AZ
{
namespace Debug
{
/**
* Trace messages driller class
*/
class TraceMessagesDriller
: public Driller
, public TraceMessageDrillerBus::Handler
{
public:
AZ_CLASS_ALLOCATOR(TraceMessagesDriller, OSAllocator, 0)
protected:
//////////////////////////////////////////////////////////////////////////
// Driller
const char* GroupName() const override { return "SystemDrillers"; }
const char* GetName() const override { return "TraceMessagesDriller"; }
const char* GetDescription() const override { return "Handles all system messages like Assert, Exception, Error, Warning, Printf, etc."; }
void Start(const Param* params = NULL, int numParams = 0) override;
void Stop() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// TraceMessagesDrillerBus
/// Triggered when a AZ_Assert failed. This is terminating event! (the code will break, crash).
void OnAssert(const char* message) override;
void OnException(const char* message) override;
void OnError(const char* window, const char* message) override;
void OnWarning(const char* window, const char* message) override;
void OnPrintf(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
};
} // namespace Debug
} // namespace AZ
Code/Framework/AzCore/AzCore/Debug/TraceMessagesDrillerBus.h
-53
View File
@@ -1,53 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include <AzCore/Driller/DrillerBus.h>
namespace AZ
{
namespace Debug
{
/**
* Trace messages event handle.
* All messages are optional (they have default implementation) and you can handle only one at a time.
* Driller messages are similar to TraceMessages, but do not provide a return value,
* as we only care about collecting driller messages, not operating on them.
*
* We use a driller bus so all messages are sending in exclusive matter no other driller messages
* can be triggered at that moment, so we already preserve the calling order. You can assume
* all access code in the driller framework in guarded. You can manually lock the driller mutex are you
* use by using \ref AZ::Debug::DrillerEBusMutex.
*/
class TraceMessageDrillerEvents
: public DrillerEBusTraits
{
public:
virtual ~TraceMessageDrillerEvents() {}
/// Triggered when a AZ_Assert failed. This is terminating event! (the code will break, crash).
virtual void OnPreAssert(const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) {}
virtual void OnAssert(const char* /*message*/) {}
virtual void OnException(const char* /*message*/) {}
virtual void OnPreError(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) {}
virtual void OnError(const char* /*window*/, const char* /*message*/) {}
virtual void OnPreWarning(const char* /*window*/, const char* /*fileName*/, int /*line*/, const char* /*func*/, const char* /*message*/) {}
virtual void OnWarning(const char* /*window*/, const char* /*message*/) {}
virtual void OnPrintf(const char* /*window*/, const char* /*message*/) {}
/**
* All trace functions you output to anything. So if you want to handle all the output this is the place.
* You are not given the choice to disable the system output as if you listen at that level you can't make
* that decision. Otherwise we can trigger an assert without even one line of message send to the console/debugger.
*/
virtual void OnOutput(const char* /*window*/, const char* /*message*/) {}
};
typedef AZ::EBus<TraceMessageDrillerEvents> TraceMessageDrillerBus;
} // namespace Debug
} // namespace AZ
Code/Framework/AzCore/AzCore/azcore_files.cmake
-3
View File
@@ -116,9 +116,6 @@ set(FILES
Debug/Trace.cpp
Debug/Trace.h
Debug/TraceMessageBus.h
Debug/TraceMessagesDriller.cpp
Debug/TraceMessagesDriller.h
Debug/TraceMessagesDrillerBus.h
Debug/TraceReflection.cpp
Debug/TraceReflection.h
DOM/DomVisitor.cpp
Code/Framework/AzCore/Platform/Common/WinAPI/AzCore/Debug/Trace_WinAPI.cpp
-3
View File
@@ -11,7 +11,6 @@
#include <AzCore/base.h>
#include <AzCore/PlatformIncl.h>
#include <AzCore/Debug/TraceMessageBus.h>
#include <AzCore/Debug/TraceMessagesDrillerBus.h>
#include <AzCore/std/string/conversions.h>
#include <AzCore/std/string/fixed_string.h>
@@ -186,8 +185,6 @@ namespace AZ::Debug
Debug::Trace::Instance().PrintCallstack(nullptr, 0, ExceptionInfo->ContextRecord);
EBUS_EVENT(Debug::TraceMessageDrillerBus, OnException, message);
bool result = false;
EBUS_EVENT_RESULT(result, Debug::TraceMessageBus, OnException, message);
if (result)