mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.1.0091: MS-Windows: Cannot interrupt gdb when program is running
Problem: MS-Windows: Cannot interrupt gdb when program is running.
Solution: Add debugbreak() and use it in the terminal debugger.
Respect 'modified' in a prompt buffer.
4551c0a9fc
This commit is contained in:
parent
b015c4741c
commit
aec3d7915c
@ -2084,6 +2084,7 @@ ctxsize() Number return |context-stack| size
|
|||||||
cursor({lnum}, {col} [, {off}])
|
cursor({lnum}, {col} [, {off}])
|
||||||
Number move cursor to {lnum}, {col}, {off}
|
Number move cursor to {lnum}, {col}, {off}
|
||||||
cursor({list}) Number move cursor to position in {list}
|
cursor({list}) Number move cursor to position in {list}
|
||||||
|
debugbreak({pid}) Number interrupt process being debugged
|
||||||
deepcopy({expr} [, {noref}]) any make a full copy of {expr}
|
deepcopy({expr} [, {noref}]) any make a full copy of {expr}
|
||||||
delete({fname} [, {flags}]) Number delete the file or directory {fname}
|
delete({fname} [, {flags}]) Number delete the file or directory {fname}
|
||||||
deletebufline({expr}, {first}[, {last}])
|
deletebufline({expr}, {first}[, {last}])
|
||||||
@ -3641,6 +3642,11 @@ exp({expr}) *exp()*
|
|||||||
:echo exp(-1)
|
:echo exp(-1)
|
||||||
< 0.367879
|
< 0.367879
|
||||||
|
|
||||||
|
debugbreak({pid}) *debugbreak()*
|
||||||
|
Specifically used to interrupt a program being debugged. It
|
||||||
|
will cause process {pid} to get a SIGTRAP. Behavior for other
|
||||||
|
processes is undefined. See |terminal-debugger|.
|
||||||
|
{Sends a SIGINT to a process {pid} other than MS-Windows}
|
||||||
|
|
||||||
expand({expr} [, {nosuf} [, {list}]]) *expand()*
|
expand({expr} [, {nosuf} [, {list}]]) *expand()*
|
||||||
Expand wildcards and the following special keywords in {expr}.
|
Expand wildcards and the following special keywords in {expr}.
|
||||||
|
@ -462,10 +462,16 @@ func s:PromptCallback(text)
|
|||||||
call s:SendCommand(a:text)
|
call s:SendCommand(a:text)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Function called when pressing CTRL-C in the prompt buffer.
|
" Function called when pressing CTRL-C in the prompt buffer and when placing a
|
||||||
|
" breakpoint.
|
||||||
func s:PromptInterrupt()
|
func s:PromptInterrupt()
|
||||||
"call ch_log('Interrupting gdb')
|
if s:pid == 0
|
||||||
call system('kill -SIGINT ' . s:pid)
|
echoerr 'Cannot interrupt gdb, did not find a process ID'
|
||||||
|
else
|
||||||
|
"call ch_log('Interrupting gdb')
|
||||||
|
" Using job_stop(s:gdbjob, 'int') does not work.
|
||||||
|
call debugbreak(s:pid)
|
||||||
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Function called when gdb outputs text.
|
" Function called when gdb outputs text.
|
||||||
@ -691,7 +697,11 @@ func s:SetBreakpoint()
|
|||||||
let do_continue = 0
|
let do_continue = 0
|
||||||
if !s:stopped
|
if !s:stopped
|
||||||
let do_continue = 1
|
let do_continue = 1
|
||||||
call s:SendCommand('-exec-interrupt')
|
if s:way == 'prompt'
|
||||||
|
call s:PromptInterrupt()
|
||||||
|
else
|
||||||
|
call s:SendCommand('-exec-interrupt')
|
||||||
|
endif
|
||||||
sleep 10m
|
sleep 10m
|
||||||
endif
|
endif
|
||||||
" Use the fname:lnum format, older gdb can't handle --source.
|
" Use the fname:lnum format, older gdb can't handle --source.
|
||||||
|
@ -7315,9 +7315,7 @@ dict_T *get_win_info(win_T *wp, int16_t tpnr, int16_t winnr)
|
|||||||
return dict;
|
return dict;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Find window specified by "vp" in tabpage "tp".
|
||||||
* Find window specified by "vp" in tabpage "tp".
|
|
||||||
*/
|
|
||||||
win_T *
|
win_T *
|
||||||
find_win_by_nr(
|
find_win_by_nr(
|
||||||
typval_T *vp,
|
typval_T *vp,
|
||||||
|
@ -82,6 +82,7 @@ return {
|
|||||||
ctxset={args={1, 2}},
|
ctxset={args={1, 2}},
|
||||||
ctxsize={},
|
ctxsize={},
|
||||||
cursor={args={1, 3}},
|
cursor={args={1, 3}},
|
||||||
|
debugbreak={args={1, 1}},
|
||||||
deepcopy={args={1, 2}},
|
deepcopy={args={1, 2}},
|
||||||
delete={args={1,2}},
|
delete={args={1,2}},
|
||||||
deletebufline={args={2,3}},
|
deletebufline={args={2,3}},
|
||||||
|
@ -1408,9 +1408,31 @@ static void f_cursor(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
|||||||
rettv->vval.v_number = 0;
|
rettv->vval.v_number = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// "debugbreak()" function
|
||||||
* "deepcopy()" function
|
static void f_debugbreak(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
*/
|
{
|
||||||
|
int pid;
|
||||||
|
|
||||||
|
rettv->vval.v_number = FAIL;
|
||||||
|
pid = (int)tv_get_number(&argvars[0]);
|
||||||
|
if (pid == 0) {
|
||||||
|
EMSG(_(e_invarg));
|
||||||
|
} else {
|
||||||
|
#ifdef WIN32
|
||||||
|
HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid);
|
||||||
|
|
||||||
|
if (hProcess != NULL) {
|
||||||
|
DebugBreakProcess(hProcess);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
rettv->vval.v_number = OK;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
uv_kill(pid, SIGINT);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "deepcopy()" function
|
||||||
static void f_deepcopy(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
static void f_deepcopy(typval_T *argvars, typval_T *rettv, FunPtr fptr)
|
||||||
{
|
{
|
||||||
int noref = 0;
|
int noref = 0;
|
||||||
|
@ -2971,7 +2971,10 @@ static char_u *u_save_line(linenr_T lnum)
|
|||||||
bool bufIsChanged(buf_T *buf)
|
bool bufIsChanged(buf_T *buf)
|
||||||
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
|
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
|
||||||
{
|
{
|
||||||
return !bt_dontwrite(buf) && (buf->b_changed || file_ff_differs(buf, true));
|
// In a "prompt" buffer we do respect 'modified', so that we can control
|
||||||
|
// closing the window by setting or resetting that option.
|
||||||
|
return (!bt_dontwrite(buf) || bt_prompt(buf))
|
||||||
|
&& (buf->b_changed || file_ff_differs(buf, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return true if any buffer has changes. Also buffers that are not written.
|
// Return true if any buffer has changes. Also buffers that are not written.
|
||||||
|
Loading…
Reference in New Issue
Block a user