Added debugger attachment utilities to the engine, fixed crash when showing console variables, improvements to timeout handling and small cleanup (#3591)
* Added debugger attachment utilities to the engine, fixed crash when showing console variables Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Removed unused variables Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Removed unneded check Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Small fix for crashes/timeouts Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Removed unused variable, fixed compile error Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Fix compile Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk> * Addressed esteban comments * Addressed tom comments Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
This commit is contained in:
@@ -573,6 +573,10 @@ static CVarBlock* VarBlockFromConsoleVars()
|
||||
IVariable* pVariable = nullptr;
|
||||
for (int i = 0; i < cmdCount; i++)
|
||||
{
|
||||
if (!cmds[i].data())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
ICVar* pCVar = console->GetCVar(cmds[i].data());
|
||||
if (!pCVar)
|
||||
{
|
||||
|
||||
+17
-2
@@ -551,7 +551,9 @@ public:
|
||||
{ "NSDocumentRevisionsDebugMode", nsDocumentRevisionsDebugMode},
|
||||
{ "skipWelcomeScreenDialog", m_bSkipWelcomeScreenDialog},
|
||||
{ "autotest_mode", m_bAutotestMode},
|
||||
{ "regdumpall", dummy }
|
||||
{ "regdumpall", dummy },
|
||||
{ "attach-debugger", dummy }, // Attaches a debugger for the current application
|
||||
{ "wait-for-debugger", dummy }, // Waits until a debugger is attached to the current application
|
||||
};
|
||||
|
||||
QString dummyString;
|
||||
@@ -2290,7 +2292,7 @@ int CCryEditApp::IdleProcessing(bool bBackgroundUpdate)
|
||||
int res = 0;
|
||||
if (bIsAppWindow || m_bForceProcessIdle || m_bKeepEditorActive
|
||||
// Automated tests must always keep the editor active, or they can get stuck
|
||||
|| m_bAutotestMode)
|
||||
|| m_bAutotestMode || m_bRunPythonTestScript)
|
||||
{
|
||||
res = 1;
|
||||
bActive = true;
|
||||
@@ -4011,6 +4013,19 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
|
||||
{
|
||||
CryAllocatorsRAII cryAllocatorsRAII;
|
||||
|
||||
// Debugging utilities
|
||||
for (int i = 1; i < argc; ++i)
|
||||
{
|
||||
if (azstricmp(argv[i], "--attach-debugger") == 0)
|
||||
{
|
||||
AZ::Debug::Trace::AttachDebugger();
|
||||
}
|
||||
else if (azstricmp(argv[i], "--wait-for-debugger") == 0)
|
||||
{
|
||||
AZ::Debug::Trace::WaitForDebugger();
|
||||
}
|
||||
}
|
||||
|
||||
// ensure the EditorEventsBus context gets created inside EditorLib
|
||||
[[maybe_unused]] const auto& editorEventsContext = AzToolsFramework::EditorEvents::Bus::GetOrCreateContext();
|
||||
|
||||
|
||||
@@ -401,6 +401,16 @@ inline namespace Commands
|
||||
{
|
||||
return static_cast<int>(GetIEditor()->GetEditorConfigPlatform());
|
||||
}
|
||||
|
||||
bool PyAttachDebugger()
|
||||
{
|
||||
return AZ::Debug::Trace::AttachDebugger();
|
||||
}
|
||||
|
||||
bool PyWaitForDebugger(float timeoutSeconds = -1.f)
|
||||
{
|
||||
return AZ::Debug::Trace::WaitForDebugger(timeoutSeconds);
|
||||
}
|
||||
}
|
||||
|
||||
namespace AzToolsFramework
|
||||
@@ -448,6 +458,9 @@ namespace AzToolsFramework
|
||||
addLegacyGeneral(behaviorContext->Method("start_process_detached", PyStartProcessDetached, nullptr, "Launches a detached process with an optional space separated list of arguments."));
|
||||
addLegacyGeneral(behaviorContext->Method("launch_lua_editor", PyLaunchLUAEditor, nullptr, "Launches the Lua editor, may receive a list of space separate file paths, or an empty string to only open the editor."));
|
||||
|
||||
addLegacyGeneral(behaviorContext->Method("attach_debugger", PyAttachDebugger, nullptr, "Prompts for attaching the debugger"));
|
||||
addLegacyGeneral(behaviorContext->Method("wait_for_debugger", PyWaitForDebugger, behaviorContext->MakeDefaultValues(-1.f), "Pauses this thread execution until the debugger has been attached"));
|
||||
|
||||
// this will put these methods into the 'azlmbr.legacy.checkout_dialog' module
|
||||
auto addCheckoutDialog = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user