Properly handle a launch failure after switching the launch operation…

… to async
1ikeadragon · Apr 11, 2023 · c288ea1 · c288ea1
1 parent f732313
commit c288ea1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/api/ffi.h b/api/ffi.h
@@ -214,6 +214,7 @@ extern "C"
 		TargetStoppedEventType,
 		ErrorEventType,
 		GeneralEventType,
+		LaunchFailureEventType,
 
 		StdoutMessageEventType,
 		BackendMessageEventType,

diff --git a/core/adapters/lldbadapter.cpp b/core/adapters/lldbadapter.cpp
@@ -188,7 +188,7 @@ bool LldbAdapter::ExecuteWithArgs(const std::string& path, const std::string& ar
 	if (!m_target.IsValid())
 	{
 		DebuggerEvent event;
-		event.type = ErrorEventType;
+		event.type = LaunchFailureEventType;
 		event.data.errorData.shortError = "LLDB failed to create target.";
 		event.data.errorData.error =
 			fmt::format("LLDB Failed to create target with \"{}\"", err.GetCString() ? err.GetCString() : "");
@@ -231,7 +231,7 @@ bool LldbAdapter::ExecuteWithArgs(const std::string& path, const std::string& ar
 		auto it = result.find_last_not_of('\n');
 		result.erase(it + 1);
 		DebuggerEvent event;
-		event.type = ErrorEventType;
+		event.type = LaunchFailureEventType;
 		event.data.errorData.shortError = fmt::format("LLDB failed to launch target.");
 		event.data.errorData.error = fmt::format("LLDB Failed to launch target with \"{}\"", result.c_str());
 		PostDebuggerEvent(event);
@@ -296,6 +296,8 @@ bool LldbAdapter::Attach(std::uint32_t pid)
 		return false;
 	}
 
+	// LLDB event listener does not get an event when the attach operation completes, so we must send an event here.
+	// This is NOT needed for Connect(), since LLDB event listener sends an event in that case.
 	DebuggerEvent dbgevt;
 	dbgevt.type = TargetStoppedEventType;
 	dbgevt.data.targetStoppedData.reason = InitialBreakpoint;

diff --git a/core/debuggercontroller.cpp b/core/debuggercontroller.cpp
@@ -1068,6 +1068,7 @@ void DebuggerController::EventHandler(const DebuggerEvent& event)
 		m_exitCode = event.data.exitData.exitCode;
 	case QuitDebuggingEventType:
 	case DetachedEventType:
+	case LaunchFailureEventType:
 	{
 		m_inputFileLoaded = false;
 		m_initialBreakpointSeen = false;
@@ -1767,6 +1768,8 @@ DebugStopReason DebuggerController::ExecuteAdapterAndWait(const DebugAdapterOper
 
 	if (ok)
 		sem.Wait();
+	else
+		reason = InternalError;
 
 	RemoveEventCallback(callback);
 	if ((operation != DebugAdapterPause) && (operation != DebugAdapterQuit) && (operation != DebugAdapterDetach))

diff --git a/ui/statusbar.cpp b/ui/statusbar.cpp
@@ -126,6 +126,7 @@ void DebuggerStatusBarWidget::updateStatusText(const DebuggerEvent& event)
 		setStatusText("Backend disconnected");
 		break;
 	case ErrorEventType:
+	case LaunchFailureEventType:
 		setStatusText(QString::fromStdString(event.data.errorData.shortError));
 		break;
 	default:

diff --git a/ui/ui.cpp b/ui/ui.cpp
@@ -1074,6 +1074,13 @@ void DebuggerUI::updateUI(const DebuggerEvent& event)
 		break;
 	}
 
+	case LaunchFailureEventType:
+	{
+		QMessageBox::critical(nullptr, QString::fromStdString(event.data.errorData.shortError),
+			QString::fromStdString(event.data.errorData.error));
+		break;
+	}
+
 	case TargetStoppedEventType:
 	case ActiveThreadChangedEvent:
 	{