Fix/consoleio crash (#467)

* updated kill procedure

* wait for task to die before killing MTerm

src/helpers/mterm/MTerm.cpp

@@ -178,16 +178,16 @@ MTerm::Run(int argc, const char* const* argv)
 void
 MTerm::Kill()
 {
-	if(fExecProcessID > -1) {
-		kill_thread(fExecProcessID);
-		fExecProcessID = -1;
-	}
 	if (fReadTask) {
 		fReadTask->Stop();
 		fReadTask = nullptr;
 	}
-	if (fFd > -1) {
+	if (fFd >= 0) {
 		close(fFd);
+		kill(-fExecProcessID, SIGHUP);
+		fExecProcessID = -1;
+		int status;
+		wait(&status);
 		fFd = -1;
 	}
 }
@@ -291,7 +291,7 @@ MTerm::_Spawn(int argc, const char* const* argv)
 		/*
 		 * set terminal interface.
 		 */
-		 tio.c_lflag &= ~ECHO;
+		tio.c_lflag &= ~ECHO;
 		if (tcsetattr(0, TCSANOW, &tio) == -1) {
 			handshake.status = PTY_NG;
 			snprintf(handshake.msg, sizeof(handshake.msg),

src/helpers/mterm/MTermView.cpp

@@ -15,6 +15,7 @@
 
 #include "ConfigManager.h"
 #include "KeyTextViewScintilla.h"
+#include "Log.h"
 #include "MTerm.h"
 #include "Styler.h"
 
@@ -147,6 +148,25 @@ MTermView::MessageReceived(BMessage* message)
 			break;
 		}
 		case Genio::Task::TASK_RESULT_MESSAGE:
+		{
+			// The task is ending. Let's avoid calling _EnsureStopped() (which terminates the task)
+			// before it has fully completed, to prevent potentially entering an inconsistent
+			// kernel lock state.
+
+			thread_id taskId = (thread_id)message->GetInt32("TaskResult::TaskID", -1);
+			if (taskId > -1) {
+				status_t threadStatus = B_OK;
+				status_t waitStatus = wait_for_thread(taskId, &threadStatus);
+				LogInfo("TASK_RESULT_MESSAGE for thread %d: threadStatus (%s) waitStatus (%s)",
+						taskId,
+						strerror(threadStatus),
+						strerror(waitStatus));
+				_EnsureStopped();
+			}
+
+
+			break;
+		}
 		case kTermViewStop:
 		{
 			_EnsureStopped();
@@ -176,7 +196,6 @@ void
 MTermView::_EnsureStopped()
 {
 	if (fMTerm != nullptr) {
-		fMTerm->Kill();
 		delete fMTerm;
 		fMTerm = nullptr;
 		fKeyTextView->EnableInput(false);