llunak created this revision.
llunak added a reviewer: clayborg.
llunak added a project: LLDB.
Herald added subscribers: lldb-commits, JDevlieghere.
'd' would be much better used for up/down shortcuts, and this also removes
the possibility of ruining the whole debugging session by accidentally hitting
'd' or 'k'. Also change menu to have both 'detach and resume' and 'detach
suspended' to make it clear which one is which. See discussion at
https://reviews.llvm.org/D68541 .
Repository:
rLLDB LLDB
https://reviews.llvm.org/D68908
Files:
lldb/source/Core/IOHandler.cpp
Index: lldb/source/Core/IOHandler.cpp
===================================================================
--- lldb/source/Core/IOHandler.cpp
+++ lldb/source/Core/IOHandler.cpp
@@ -3358,7 +3358,8 @@
eMenuID_Process,
eMenuID_ProcessAttach,
- eMenuID_ProcessDetach,
+ eMenuID_ProcessDetachResume,
+ eMenuID_ProcessDetachSuspended,
eMenuID_ProcessLaunch,
eMenuID_ProcessContinue,
eMenuID_ProcessHalt,
@@ -3503,13 +3504,14 @@
}
return MenuActionResult::Handled;
- case eMenuID_ProcessDetach: {
+ case eMenuID_ProcessDetachResume:
+ case eMenuID_ProcessDetachSuspended: {
ExecutionContext exe_ctx =
m_debugger.GetCommandInterpreter().GetExecutionContext();
if (exe_ctx.HasProcessScope()) {
Process *process = exe_ctx.GetProcessPtr();
if (process && process->IsAlive())
- process->Detach(false);
+
process->Detach(menu.GetIdentifier()==eMenuID_ProcessDetachSuspended);
}
}
return MenuActionResult::Handled;
@@ -3762,10 +3764,8 @@
{KEY_NPAGE, "Page down"},
{'b', "Set breakpoint on selected source/disassembly line"},
{'c', "Continue process"},
- {'d', "Detach and resume process"},
{'D', "Detach with process suspended"},
{'h', "Show help dialog"},
- {'k', "Kill process"},
{'n', "Step over (source line)"},
{'N', "Step over (single instruction)"},
{'o', "Step out"},
@@ -4327,26 +4327,15 @@
}
return eKeyHandled;
- case 'd': // 'd' == detach and let run
case 'D': // 'D' == detach and keep stopped
{
ExecutionContext exe_ctx =
m_debugger.GetCommandInterpreter().GetExecutionContext();
if (exe_ctx.HasProcessScope())
- exe_ctx.GetProcessRef().Detach(c == 'D');
+ exe_ctx.GetProcessRef().Detach(true);
}
return eKeyHandled;
- case 'k':
- // 'k' == kill
- {
- ExecutionContext exe_ctx =
- m_debugger.GetCommandInterpreter().GetExecutionContext();
- if (exe_ctx.HasProcessScope())
- exe_ctx.GetProcessRef().Destroy(false);
- }
- return eKeyHandled;
-
case 'c':
// 'c' == continue
{
@@ -4467,7 +4456,9 @@
process_menu_sp->AddSubmenu(MenuSP(new Menu(
"Attach", nullptr, 'a', ApplicationDelegate::eMenuID_ProcessAttach)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(
- "Detach", nullptr, 'd', ApplicationDelegate::eMenuID_ProcessDetach)));
+ "Detach and resume", nullptr, 'd',
ApplicationDelegate::eMenuID_ProcessDetachResume)));
+ process_menu_sp->AddSubmenu(MenuSP(new Menu(
+ "Detach suspended", nullptr, 's',
ApplicationDelegate::eMenuID_ProcessDetachSuspended)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(
"Launch", nullptr, 'l', ApplicationDelegate::eMenuID_ProcessLaunch)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(Menu::Type::Separator)));
Index: lldb/source/Core/IOHandler.cpp
===================================================================
--- lldb/source/Core/IOHandler.cpp
+++ lldb/source/Core/IOHandler.cpp
@@ -3358,7 +3358,8 @@
eMenuID_Process,
eMenuID_ProcessAttach,
- eMenuID_ProcessDetach,
+ eMenuID_ProcessDetachResume,
+ eMenuID_ProcessDetachSuspended,
eMenuID_ProcessLaunch,
eMenuID_ProcessContinue,
eMenuID_ProcessHalt,
@@ -3503,13 +3504,14 @@
}
return MenuActionResult::Handled;
- case eMenuID_ProcessDetach: {
+ case eMenuID_ProcessDetachResume:
+ case eMenuID_ProcessDetachSuspended: {
ExecutionContext exe_ctx =
m_debugger.GetCommandInterpreter().GetExecutionContext();
if (exe_ctx.HasProcessScope()) {
Process *process = exe_ctx.GetProcessPtr();
if (process && process->IsAlive())
- process->Detach(false);
+ process->Detach(menu.GetIdentifier()==eMenuID_ProcessDetachSuspended);
}
}
return MenuActionResult::Handled;
@@ -3762,10 +3764,8 @@
{KEY_NPAGE, "Page down"},
{'b', "Set breakpoint on selected source/disassembly line"},
{'c', "Continue process"},
- {'d', "Detach and resume process"},
{'D', "Detach with process suspended"},
{'h', "Show help dialog"},
- {'k', "Kill process"},
{'n', "Step over (source line)"},
{'N', "Step over (single instruction)"},
{'o', "Step out"},
@@ -4327,26 +4327,15 @@
}
return eKeyHandled;
- case 'd': // 'd' == detach and let run
case 'D': // 'D' == detach and keep stopped
{
ExecutionContext exe_ctx =
m_debugger.GetCommandInterpreter().GetExecutionContext();
if (exe_ctx.HasProcessScope())
- exe_ctx.GetProcessRef().Detach(c == 'D');
+ exe_ctx.GetProcessRef().Detach(true);
}
return eKeyHandled;
- case 'k':
- // 'k' == kill
- {
- ExecutionContext exe_ctx =
- m_debugger.GetCommandInterpreter().GetExecutionContext();
- if (exe_ctx.HasProcessScope())
- exe_ctx.GetProcessRef().Destroy(false);
- }
- return eKeyHandled;
-
case 'c':
// 'c' == continue
{
@@ -4467,7 +4456,9 @@
process_menu_sp->AddSubmenu(MenuSP(new Menu(
"Attach", nullptr, 'a', ApplicationDelegate::eMenuID_ProcessAttach)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(
- "Detach", nullptr, 'd', ApplicationDelegate::eMenuID_ProcessDetach)));
+ "Detach and resume", nullptr, 'd', ApplicationDelegate::eMenuID_ProcessDetachResume)));
+ process_menu_sp->AddSubmenu(MenuSP(new Menu(
+ "Detach suspended", nullptr, 's', ApplicationDelegate::eMenuID_ProcessDetachSuspended)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(
"Launch", nullptr, 'l', ApplicationDelegate::eMenuID_ProcessLaunch)));
process_menu_sp->AddSubmenu(MenuSP(new Menu(Menu::Type::Separator)));
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
